aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2011-10-27 23:40:02 -0500
committerNiels Horn <niels.horn@slackbuilds.org>2011-11-04 21:59:28 -0200
commit32dbe4cecea1eb62e6dfebff91df653b3e6755b3 (patch)
treefeea68bcaf224bd4278e3f06fa15403c9aab9067 /network
parentc4939636eec96bd2108a6668d96ff586c0e717ac (diff)
network/claws-mail-extra-plugins: Fixup some conflict markers
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild14
1 files changed, 0 insertions, 14 deletions
diff --git a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
index 26b3a5c8c08a..48bdb111954b 100644
--- a/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
+++ b/network/claws-mail-extra-plugins/claws-mail-extra-plugins.SlackBuild
@@ -30,11 +30,7 @@
PRGNAM=claws-mail-extra-plugins
VERSION=3.7.10
-<<<<<<< HEAD
-BUILD=${BUILD:-1}
-=======
BUILD=${BUILD:-3}
->>>>>>> 25cbc9c... network/claws-mail-extra-plugins: Make plugins easier to define.
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -50,22 +46,12 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-<<<<<<< HEAD
-
-# This is a *complete* list of available plugins, see the README for
-# information on plugins you may wish you remove from this list.
-PLUGIN_LIST="acpi_notifier address_keeper archive att_remover attachwarner \
- bsfilter_plugin clamd fancy fetchinfo-plugin geolocation_plugin \
- gtkhtml2_viewer mailmbox newmail notification_plugin perl_plugin \
- python_plugin rssyl spam_report tnef_parse vcalendar"
-=======
# This is an *incomplete* list of available plugins, see the README for
# information on plugins you may wish you add/remove from this list.
PLUGIN_LIST=${PLUGIN_LIST:-"acpi_notifier address_keeper archive \
att_remover attachwarner bsfilter_plugin clamd fetchinfo-plugin \
gtkhtml2_viewer mailmbox newmail notification_plugin \
perl_plugin python_plugin rssyl spam_report tnef_parse vcalendar"}
->>>>>>> 25cbc9c... network/claws-mail-extra-plugins: Make plugins easier to define.
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i486"