summaryrefslogtreecommitdiff
path: root/extensions/TwoColConflict
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/TwoColConflict')
m---------extensions/TwoColConflict0
1 files changed, 0 insertions, 0 deletions
diff --git a/extensions/TwoColConflict b/extensions/TwoColConflict
new file mode 160000
+Subproject c5afa704e9be0e841630800206b8b0033ea394b