diff options
Diffstat (limited to 'chat-im/carrier/CONFLICTS')
-rwxr-xr-x | chat-im/carrier/CONFLICTS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chat-im/carrier/CONFLICTS b/chat-im/carrier/CONFLICTS new file mode 100755 index 0000000000..b9e809859f --- /dev/null +++ b/chat-im/carrier/CONFLICTS @@ -0,0 +1,2 @@ +conflicts funpidgin y +conflicts pidgin |