aboutsummaryrefslogtreecommitdiff
path: root/.icons/awkward/24x24/emblems/vcs-conflicting.svg
diff options
context:
space:
mode:
Diffstat (limited to '.icons/awkward/24x24/emblems/vcs-conflicting.svg')
-rw-r--r--.icons/awkward/24x24/emblems/vcs-conflicting.svg4
1 files changed, 4 insertions, 0 deletions
diff --git a/.icons/awkward/24x24/emblems/vcs-conflicting.svg b/.icons/awkward/24x24/emblems/vcs-conflicting.svg
new file mode 100644
index 00000000..237f8ef5
--- /dev/null
+++ b/.icons/awkward/24x24/emblems/vcs-conflicting.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
+ <circle style="fill:#f44336" cx="12" cy="12" r="10"/>
+ <path style="fill:#ffffff" d="M 8,6 12,10 16,6 18,8 14,12 18,16 16,18 12,14 8,18 6,16 10,12 6,8 Z"/>
+</svg>