Fixed the build; line endings -> Unix.

2010-11-08 09:23:16 +00:00
parent 6d8e7edcbf
commit 52a2823f7b
2 changed files with 27 additions and 28 deletions
@@ -1,4 +1,3 @@
-<<<<<<< .mine
 #include "PrecompiledHeader.h"
 #include <iomanip>
 #include "DeckEditorMenu.h"