removed merge code into the files

Author: R0mb0

.gitignore

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 ## Core latex/pdflatex auxiliary files:
 *.aux
 *.lof
@@ -282,4 +281,3 @@ TSWLatexianTemp*
 *.log
 *.pdf
 *.gz
->>>>>>> dc11d30427ff5fa5b40e710948919ab14fbb85d3

LICENSE

@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 Creative Commons Legal Code
 
 CC0 1.0 Universal
@@ -993,5 +993,4 @@ public licenses.
 
 
 
-Creative Commons may be contacted at creativecommons.org.
->>>>>>> dc11d30427ff5fa5b40e710948919ab14fbb85d3
+Creative Commons may be contacted at creativecommons.org.

README.md

@@ -1,6 +1,6 @@
-<<<<<<< HEAD
+
 # AlternativePrescriptiveStudyMethod
-A Prescriptive Study Method focussed on the exercise
+A Prescriptive Study Method focussed on the exercise.
 =======
 Shield: [![CC BY-NC-SA 4.0][cc-by-nc-sa-shield]][cc-by-nc-sa]
 
@@ -16,5 +16,4 @@ This work is licensed under a
 
 
 # Prescriptive Study Method
-A method to simplify the study process in way to increase the efficiency 
->>>>>>> dc11d30427ff5fa5b40e710948919ab14fbb85d3
+A method to simplify the study process in way to increase the efficiency.