From 259debb981a976da83ba1c9b93fb6e9ec1a68fe8 Mon Sep 17 00:00:00 2001
From: Michał Masłowski <mtjm@mtjm.eu>
Date: Mon, 26 Dec 2011 18:57:25 +0100
Subject: Remove PKGBUILD-less directories and fix unmerged PKGBUILDs.

---
 libre/icecat/PKGBUILD | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'libre/icecat')

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e45da8749..05507bbaa 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -83,11 +83,8 @@ build() {
   #patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch"
   #patch -Np1 -i "$srcdir/firefox-version.patch"
 
-<<<<<<< HEAD
   [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig
 
-=======
->>>>>>> libre/master
   # Fix PRE_RELEASE_SUFFIX
   sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
       browser/base/Makefile.in
-- 
cgit v1.2.3-54-g00ecf