aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.sync-conflict-20181212-190307-PKPUQWZ.SRCINFO0
1 files changed, 0 insertions, 0 deletions
diff --git a/.sync-conflict-20181212-190307-PKPUQWZ.SRCINFO b/.sync-conflict-20181212-190307-PKPUQWZ.SRCINFO
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/.sync-conflict-20181212-190307-PKPUQWZ.SRCINFO
+++ /dev/null