summaryrefslogblamecommitdiffstats
path: root/chat-im/pidgin/CONFLICTS
blob: 3c700c9cd892f6cd12a2daaad4a1f9e631adb4b5 (plain) (tree) 
bf1b444069

1637017164

2cedb9281e

1

2

3

                
                   
                 
conflicts gaim y
conflicts funpidgin
conflicts carrier
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-18 00:51:13 +0000