merge conflicts

Yeeef · Jun 4, 2019 · fcb2210 · fcb2210
2 parents 4d7d0f7 + a64e985
commit fcb2210
Show file tree

Hide file tree

Showing 14 changed files with 1,538 additions and 63 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,8 @@ ref_codes
 *.idea
 *graphs
 *parselog.txt
-*Presentation.pptx
+<<<<<<< HEAD
+*Presentation.pptx
+=======
+*.out
+>>>>>>> a64e985461e13675c483f01a2787f46475ddc61e
diff --git a/report/Presentation.pptx b/report/Presentation.pptx