[Debian-hebrew-package] [svn] r251 - pkg/libhdate/trunk

[Baruch Even]

Author: baruch
Date: Sat Nov 26 20:01:51 2005
New Revision: 251

Modified:
   pkg/libhdate/trunk/configure
Log:
Fix parts of a bad merge

Modified: pkg/libhdate/trunk/configure
==============================================================================
--- pkg/libhdate/trunk/configure	(original)
+++ pkg/libhdate/trunk/configure	Sat Nov 26 20:01:51 2005
@@ -27131,12 +27131,7 @@
 
 
 
-<<<<<<< .working
-
-                                                                                                                                                                          ac_config_files="$ac_config_files Makefile libhdate.spec libhdate.pc intl/Makefile po/Makefile.in src/Makefile examples/Makefile examples/hcal/Makefile examples/ical/Makefile examples/html/Makefile examples/hebcal/Makefile examples/bindings/Makefile bindings/Makefile bindings/python/Makefile bindings/perl/Makefile bindings/pascal/Makefile"
-=======
                                                                                                                                                                 ac_config_files="$ac_config_files Makefile libhdate.spec libhdate.pc intl/Makefile po/Makefile.in src/Makefile examples/Makefile examples/hcal/Makefile examples/ical/Makefile examples/html/Makefile examples/hebcal/Makefile examples/bindings/Makefile bindings/Makefile bindings/python/Makefile bindings/perl/Makefile bindings/pascal/Makefile"
->>>>>>> .merge-right.r249
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -27720,10 +27715,6 @@
   "bindings/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES bindings/python/Makefile" ;;
   "bindings/perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES bindings/perl/Makefile" ;;
   "bindings/pascal/Makefile" ) CONFIG_FILES="$CONFIG_FILES bindings/pascal/Makefile" ;;
-<<<<<<< .working
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-=======
->>>>>>> .merge-right.r249
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}