summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.merge_file_Akj4Wc.lock0
-rw-r--r--.merge_file_LGcQlo.lock0
2 files changed, 0 insertions, 0 deletions
diff --git a/.merge_file_Akj4Wc.lock b/.merge_file_Akj4Wc.lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.merge_file_Akj4Wc.lock
diff --git a/.merge_file_LGcQlo.lock b/.merge_file_LGcQlo.lock
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.merge_file_LGcQlo.lock