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