diff options
Diffstat (limited to 'collab/cola/CONFLICTS')
| -rwxr-xr-x | collab/cola/CONFLICTS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/collab/cola/CONFLICTS b/collab/cola/CONFLICTS new file mode 100755 index 0000000000..1854aaac27 --- /dev/null +++ b/collab/cola/CONFLICTS @@ -0,0 +1 @@ +conflicts cola y |