Merge remote-tracking branch 'origin/develop' into develop

graphefruit · Oct 29, 2022 · 3f2c0a4 · 3f2c0a4
2 parents e4f3576 + d66b07b
commit 3f2c0a4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,11 @@ Different features are supported by this app, a brief overview you'll find here.
 - Own water section
 - Cup your brews by aromatics or flavors
 - Connect smart scales (Decent Scale, Acaia Lunar, Hiroia Jimmy)
+  <<<<<<< HEAD
 
+=======
+
+> > > > > > > develop
 
 ## Special thanks