Merge pull request jackwadden#7 from knightofions/master

Pull request test
kevinaangstadt · Jun 17, 2016 · 9acdecd · 9acdecd
2 parents 2280fcb + b666dfe
commit 9acdecd
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,4 +1,10 @@
+<<<<<<< HEAD
+
+//Dummy line for pull request test
+//Hello at the top
+=======
 //
+>>>>>>> upstream/master
 #include "automata.h"
 #include "pass.h"
 #include "profiler.h"