From 16998a8ca8c05215907f90dc29fd070b0bb78ae3 Mon Sep 17 00:00:00 2001
From: tofasthacker <tofasthacker@noreply.localhost>
Date: Sun, 15 Oct 2023 03:01:24 +0000
Subject: [PATCH] Update README.md

---
 README.md | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 4dff72be..bde614d3 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 - [x] Calculator
 - [x] Redo music control gestures
 	- [x] Swipe up toggles control mode and swipe down exits
-	- [x] Swipe left/right goes to watchface/another app
+- [x] Swipe left/right goes to watchface/another app
 - [x] Rearrange quick acces and apps
-
+- [x] Exponent button on calculator
 
 ## Pending merge
 
@@ -22,21 +22,13 @@
 - [ ] Remap button double click (to music app)
 
 ### Moses
-<<<<<<< HEAD
-	
-=======
-- [x] Redo music control gestures
-	- [x] Swipe up toggles control mode and swipe down exits
-	- [x] Swipe left/right goes to watchface/another app
-- [x] Exponent button on calculator
-- [x] Rearrange quick acces and apps
+
+
 - [ ] Add quick ring settings
 
->>>>>>> refs/remotes/origin/main
 ## Medium priority
 - [ ] Temp sensor w/ arduino
 - [ ] Homeassistant control
-- [ ] Periodic heart rate measurement
 
 ## Lower priority
 - [ ] Maybe some prank watchfaces