thomasbratt
diff --git a/‎mit-license.txt renamed to ‎MIT-LICENSE.txt b/‎mit-license.txt renamed to ‎MIT-LICENSE.txt
diff --git a/‎readme.markdown renamed to ‎README.markdown
Lines changed: 4 additions & 0 deletions b/‎readme.markdown renamed to ‎README.markdown
Lines changed: 4 additions & 0 deletions
@@ -38,3 +38,7 @@ Source Code Repository
 ----------------------
 
 https://github.com/thomasbratt/PointerPerformanceTest
+<<<<<<< HEAD:README.markdown
+
+=======
+>>>>>>> ef1fdcd86dd01ed58656656a604916e91feae221:readme.markdown