summaryrefslogtreecommitdiff
path: root/notes/index.md
diff options
context:
space:
mode:
Diffstat (limited to 'notes/index.md')
-rw-r--r--notes/index.md6
1 files changed, 2 insertions, 4 deletions
diff --git a/notes/index.md b/notes/index.md
index 6567f25e..dc2a3cb8 100644
--- a/notes/index.md
+++ b/notes/index.md
@@ -14,12 +14,10 @@
['Never split the difference' book notes](./never-split-the-difference.md)
['Mind Management' book notes](./mind-management.md)
['Mental Combat' book notes](./mental-combat.md)
-<<<<<<< HEAD
-[Love People, Use Things](./love-people-use-things.md)
-=======
->>>>>>> 25ccc92b78135a5e494b170b65329e2b88b10815
+['Love People, Use Things' book notes](./love-people-use-things.md)
['Joy On Domand' book notes](./joy-on-demand.md)
['Influence without Authority' book notes](./influence-wihout-authority.md)
+['Fluent Forever' book notes](./fluent-forever.md)
['Eat That Frog' book notes](./eat-that-frog.md)
['Software Developmers Career Guide and Soft Skills' book notes](./career-guide-and-soft-skills.md)
['A Monk's Guide to Happiness' book notes](./a-monks-guide-to-happiness.md)