COMPOSER: Delete leftover git conflict marker

whoozle · Oct 18, 2016 · 17f3626 · 17f3626
1 parent a946e9e
commit 17f3626
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
@@ -29,7 +29,6 @@
 #include "common/debug.h"
 #include "common/debug-channels.h"
 #include "common/error.h"
-=======
 #include "common/serializer.h"
 #include "common/textconsole.h"
 #include "common/rect.h"