Fix git conflict with README file (wtf)

6 jaren geleden · 64563e0b8f
commit 64563e0b8f
--- a/README.md
+++ b/README.md
@ -2,4 +2,4 @@ NickelBox
 =========

 NickelBox is a point of sale app.  It integrates with BinStack for inventory
-management.
+management.