summaryrefslogtreecommitdiff
path: root/.git_copy/MERGE_MODE
diff options
context:
space:
mode:
Diffstat (limited to '.git_copy/MERGE_MODE')
-rw-r--r--.git_copy/MERGE_MODE0
1 files changed, 0 insertions, 0 deletions
diff --git a/.git_copy/MERGE_MODE b/.git_copy/MERGE_MODE
deleted file mode 100644
index e69de29..0000000
--- a/.git_copy/MERGE_MODE
+++ /dev/null