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