summaryrefslogtreecommitdiff
path: root/plugins/torrent
diff options
context:
space:
mode:
authorAndrew Janke <andrew@apjanke.net>2015-06-15 16:55:25 -0400
committerAndrew Janke <andrew@apjanke.net>2015-06-15 16:55:25 -0400
commitd0670aa2bd5186357961dd90c4a97c2c3842f728 (patch)
treee593b128959a48dc7568df889eb484d75d8be576 /plugins/torrent
parentab18795f3cd9bd45aec60a4a4bd8ecf820eb86c4 (diff)
downloadzsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.tar.gz
zsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.tar.bz2
zsh-d0670aa2bd5186357961dd90c4a97c2c3842f728.zip
Fix merge conflict for jira-prefix and jira add comment
Diffstat (limited to 'plugins/torrent')
0 files changed, 0 insertions, 0 deletions