hmm, removing git remainings. Sorry about this

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6d1d7b693ae53d12eb7bb7504cc2fb91a234e0da..be7d3646f6c10cc91cddab2b67d0c4fc063d5eb3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2235,7 +2235,6 @@ CLEAN_PKG += clinkcc
 DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
 
 # ***************************************************************************
-<<<<<<< Updated upstream:extras/contrib/src/Makefile
 # YASM assembler
 # ***************************************************************************
 
@@ -2254,8 +2253,6 @@ CLEAN_PKG += yasm
 DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
 
 # ***************************************************************************
-=======
->>>>>>> Stashed changes:extras/contrib/src/Makefile
 # Copy aclocal files
 # This is necessary for --missing aclocal to succeed after a
 # configure.ac/Makefile.am change in the vlc root dir