Cleaning and making nice

van-ess0 · Mar 27, 2014 · e6913da · e6913da
1 parent 9358938
commit e6913da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -3,10 +3,5 @@ KvadraaSolve
 
 This is the simple training app to solve Quadratic equation. Wrote with QML/Sailfish Silicia for SailfishOS.
 
-<<<<<<< HEAD
 Real full workable version!
-=======
-//OK, this is release commit! 
 
-Still working aroung Cover.
->>>>>>> 58e52bca28091bb0bffe67d231cd48a083a8f29e
diff --git a/README.md~ b/README.md~
@@ -3,4 +3,10 @@ KvadraaSolve
 
 This is the simple training app to solve Quadratic equation. Wrote with QML/Sailfish Silicia for SailfishOS.
 
-OK, this is release commit! 
+<<<<<<< HEAD
+Real full workable version!
+=======
+//OK, this is release commit! 
+
+Still working aroung Cover.
+>>>>>>> 58e52bca28091bb0bffe67d231cd48a083a8f29e