summaryrefslogtreecommitdiffstats
path: root/chat-im/pidgin/CONFLICTS
diff options
context:
space:
mode:
Diffstat (limited to 'chat-im/pidgin/CONFLICTS')
-rwxr-xr-xchat-im/pidgin/CONFLICTS2
1 files changed, 2 insertions, 0 deletions
diff --git a/chat-im/pidgin/CONFLICTS b/chat-im/pidgin/CONFLICTS
index cdfc9ff4d3..3c700c9cd8 100755
--- a/chat-im/pidgin/CONFLICTS
+++ b/chat-im/pidgin/CONFLICTS
@@ -1 +1,3 @@
conflicts gaim y
+conflicts funpidgin
+conflicts carrier