summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Sherwood2010-07-23 06:04:24 -0500
committerGeorge Sherwood2010-07-23 06:04:24 -0500
commitb911e653355662a15e72ea2444c014bae7f2f1d4 (patch)
tree3c2dc353ea3b96fe85dbc093b17ca83a06415d47
parent0290ded213ea0ee2b744660ca2a8ec80a8a78abc (diff)
xulrunner: clean up merge
-rwxr-xr-xhttp/xulrunner/DETAILS5
1 files changed, 0 insertions, 5 deletions
diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index da670ef138..685c7eda16 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -9,12 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
WEB_SITE=http://www.mozilla.org/
-<<<<<<< HEAD
- SECURITY_PATCH=14
-=======
SECURITY_PATCH=15
- PATCHLEVEL=0
->>>>>>> fe44b49... xulrunner 1.9.2.7, FFVERSION=3.6.7, SECURITY_PATCH=15
ENTERED=20060829
LICENSE[0]=MPL
DOCS="LICENSE README.txt"