aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2020-01-21 15:08:57 +0100
committerMartchus2020-01-21 15:08:57 +0100
commit89504e1afcc268919ce07d5789565ab81b5c7a54 (patch)
tree9f3f5c89c624a56e4d50e5b745166d14e595c181
parent15c660cf2767ed379869cbd35361d567d283e2c2 (diff)
downloadaur-89504e1afcc268919ce07d5789565ab81b5c7a54.tar.gz
Remove .sync-conflict file
-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