From: Robert Saalbach <saalbach.robert@outlook.de>
Date: Thu, 17 Jul 2025 12:06:08 +0000 (+0100)
Subject: solved merge
X-Git-Url: https://git.saalbach.dev/?a=commitdiff_plain;h=3a8a79bc47ae17c28e22fb8204e15488bff12389;p=research-obsidian.git

solved merge
---

3a8a79bc47ae17c28e22fb8204e15488bff12389
diff --cc Watchlist & Do List.md
index 562be93,43c5132..197e821
--- a/Watchlist & Do List.md
+++ b/Watchlist & Do List.md
@@@ -16,7 -16,7 +16,7 @@@ Cowboy Bepo
  Food Wars
  
  The bear
--
++ 
  - Should make a strawberry pie
  - should make an apple pie
  - try out some new recipes and write down
@@@ -27,5 -27,10 +27,15 @@@ lots of smoothie
  Friends
  
  lucifer
 +
++
 +make a better calendar app
++
+ Soma
+ SAS Heroes
+ 
+ ## things to look into
+ 
+ 
 -- What about the guy who was gonna make a video about fake driver's licesnes? What happened to him? Did he get through with it, what where the legal proceedings?
++- What about the guy who was gonna make a video about fake driver's licesnes? What happened to him? Did he get through with it, what where the legal proceedings?
++