fix bad merge

20da8f41 · Simon Morlat · 5db6533a · 20da8f41
Commit 20da8f41 authored Oct 08, 2010 by Simon Morlat
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/layouts.c src/layouts.c +0 -4

No files found.
--- a/src/layouts.c
+++ b/src/layouts.c
@@ -38,11 +38,7 @@ static void center_rectangle(MSVideoSize wsize, MSVideoSize vsize, MSRect *rect)
 	rect->h=h;
 }

-<<<<<<< HEAD

-=======
-#define LOCAL_BORDER_SIZE 2
->>>>>>> ab14e9c78bea0b705f68f9b2e554fa565b4a3ecf
 #define LOCAL_POS_OFFSET 10

 /**