diff options
| author | Paul Buetow <paul@buetow.org> | 2025-02-21 11:12:53 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2025-02-21 11:12:53 +0200 |
| commit | e43cb338bf704f1b50cc89c8efbfa5ac0f19932e (patch) | |
| tree | 53c414720564867fde69acfe9d01212f43a7fa8a /notes/index.html | |
| parent | 76f252524871b203ac11279511ea0adcf8b1386c (diff) | |
| parent | b9abc29d0593a4d65919a80cdc0978dc881eb2f1 (diff) | |
conflicts
Diffstat (limited to 'notes/index.html')
| -rw-r--r-- | notes/index.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/notes/index.html b/notes/index.html index e710ddc5..2afcc4c3 100644 --- a/notes/index.html +++ b/notes/index.html @@ -27,7 +27,10 @@ <a class='textlink' href='./never-split-the-difference.html'>'Never split the difference' book notes</a><br /> <a class='textlink' href='./mind-management.html'>'Mind Management' book notes</a><br /> <a class='textlink' href='./mental-combat.html'>'Mental Combat' book notes</a><br /> +<<<<<<< HEAD <a class='textlink' href='./love-people-use-things.html'>Love People, Use Things</a><br /> +======= +>>>>>>> b9abc29d0593a4d65919a80cdc0978dc881eb2f1 <a class='textlink' href='./joy-on-demand.html'>'Joy On Domand' book notes</a><br /> <a class='textlink' href='./influence-wihout-authority.html'>'Influence without Authority' book notes</a><br /> <a class='textlink' href='./eat-that-frog.html'>'Eat That Frog' book notes</a><br /> |