X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build-aux%2Fdepcomp;fp=build-aux%2Fdepcomp;h=7856baec97e8455e09c7f72eb7e5f33aea9ceed2;hb=80a029602f5b2707ca8d2487843ecb9e0df74a6a;hp=81e64f6bf3b5a13f6ad46cd087f3d037310eb507;hpb=1f28fa660e4ca110f073251a24ef3a94ad97ef69;p=gnulib.git

diff --git a/build-aux/depcomp b/build-aux/depcomp
index 81e64f6bf..7856baec9 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,7 +1,11 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
+<<<<<<< HEAD
+scriptversion=2011-12-04.11; # UTC
+=======
 scriptversion=2012-03-12.15; # UTC
+>>>>>>> snapshot-start
 
 # Copyright (C) 1999-2012 Free Software Foundation, Inc.