From 539f55313379408d584c5eee70c52d2677b35649 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= <vsc@dcc.fc.up.pt>
Date: Wed, 1 Feb 2012 20:59:43 +0000
Subject: [PATCH] merge

---
 .gitmodules | 4 ----
 configure   | 2 --
 2 files changed, 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 489eadd29..a98654459 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,8 +36,4 @@
 	url = git://yap.git.sourceforge.net/gitroot/yap/pldoc
 [submodule "packages/real"]
 	path = packages/real
-<<<<<<< HEAD
-	url = vsc@www.swi-prolog.org:/home/pl/git/packages/real.git
-=======
 	url = git://www.swi-prolog.org/home/pl/git/packages/real.git
->>>>>>> 7e73c781b06cb917d5a065ead5f872c28da619f1
diff --git a/configure b/configure
index 571eb516e..12c938229 100755
--- a/configure
+++ b/configure
@@ -1549,7 +1549,6 @@ ac_abs_builddir=$ac_pwd$ac_dir_suffix
 # for backward compatibility:
 ac_top_builddir=$ac_top_build_prefix
 
-<<<<<<< HEAD
 	  if test ${have_dl} = yes
 	  then
 	    LIBS="$LIBS -ldl"
@@ -1709,7 +1708,6 @@ generated by GNU Autoconf 2.68
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
->>>>>>> 7e73c781b06cb917d5a065ead5f872c28da619f1
 _ACEOF
   exit
 fi