Update README.md

iamboorrito · Sep 2, 2017 · c900baf · c900baf
1 parent aad3cd0
commit c900baf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 # Lagrange-Interpolation-Demo
-<<<<<<< HEAD
+
 A graphical demo of using Newton's Divided Differences to calculate Lagrange polynomials.
 
 I made this gif on my laptop, but the program actually runs seemlessly.
 
 ![Sample](Screenshots/Sample.gif)
-=======
+
 A graphical demo of Newton's Divided Differences to calculate Lagrange polynomials.
 
 Click to add points to the canvas and hold shift to move or delete them.
->>>>>>> origin/master
+