Fixed up unresolved conflict which was breaking compile.

2010-02-15 11:43:16 +00:00
parent ecb1f2064f
commit 966992abd4
1 changed files with 0 additions and 4 deletions
@@ -40,11 +40,7 @@
 #include "config.h"     /* the custom stuff */
 #include "rp.h"
 #include "wp.h"
-<<<<<<< .mine
-#include "lo.h"
-=======
 #include "handlers.h"
->>>>>>> .r1574

 #ifndef MAX_LIGHTING_OUTPUTS
 #define MAX_LIGHTING_OUTPUTS 5