diff options
| author | George Sherwood | 2010-07-23 06:03:31 -0500 |
|---|---|---|
| committer | George Sherwood | 2010-07-23 06:03:31 -0500 |
| commit | 0290ded213ea0ee2b744660ca2a8ec80a8a78abc (patch) | |
| tree | 136cef54de494b1678e8b365bb88fa5f18db6a39 | |
| parent | 55074d9617ae38ce73b1d6e17a4020c27a4a03cc (diff) | |
firefox: Clean up merge
| -rwxr-xr-x | http/firefox/DETAILS | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS index 443665fb2b..8a27cc817c 100755 --- a/http/firefox/DETAILS +++ b/http/firefox/DETAILS @@ -19,10 +19,6 @@ else SOURCE2_URL[0]=$SOURCE_URL.asc SECURITY_PATCH=33 fi -<<<<<<< HEAD -======= - PATCHLEVEL=0 ->>>>>>> 6b7cb26... firefox 3.6.7, SECURITY_PATCH=33 SOURCE2_IGNORE=signature SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" WEB_SITE=http://www.mozilla.org/projects/firefox/ |