[vlc-devel] commit: hmm, removing git remainings. Sorry about this ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Apr 13 20:16:43 2008 +0200| [05eac2dbdf9f3a3231dc2eefda62202837fdeec6]

hmm, removing git remainings. Sorry about this

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=05eac2dbdf9f3a3231dc2eefda62202837fdeec6
---

 extras/contrib/src/Makefile |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6d1d7b6..be7d364 100644
--- 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