Merge tag 'snapshot-start' into stable

[gnulib.git] / build-aux / depcomp

diff --git a/build-aux/depcomp b/build-aux/depcomp
index 81e64f6..7856bae 100755 (executable)
--- 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.