talons

commit 392f6b285662bea2f6962d01184c5cc64a4fa733
parent 68fd42c359a98575690b67dc3f4a7189aa92eb94
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  5 Aug 2008 06:53:56 +0000

Fix conflict

Diffstat:
M
configure.ac
 | 
8
--------

1 file changed, 0 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -142,19 +142,11 @@ then
 fi
 
 CFLAGS="$CFLAGS -Wall"
-<<<<<<< configure.ac
 
 if test $USE_MAINTAINER_MODE = yes; then
 	CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
 fi
 
-=======
-
-if test $USE_MAINTAINER_MODE = yes; then
-	CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
-fi
-
->>>>>>> 1.654.2.3521
 pthread_name=
 case "$target" in
 *-darwin*)