summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2014-08-06 18:39:17 +0200
committerDavid Tardon <dtardon@redhat.com>2014-08-06 18:39:17 +0200
commit9411c73cf8ac2f036ce21c99962788e59148158c (patch)
treec84326a5d789192fe8bc641c0965684ac46aef14 /.gitignore
parentcc5bb5cd5316199307fcafa59583314f040b8733 (diff)
update help ids for Resolve Conflicts dlg
Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions