aboutsummaryrefslogtreecommitdiff
path: root/.icons/awkward/16x16/emblems/vcs-conflicting.svg
diff options
context:
space:
mode:
Diffstat (limited to '.icons/awkward/16x16/emblems/vcs-conflicting.svg')
-rw-r--r--.icons/awkward/16x16/emblems/vcs-conflicting.svg5
1 files changed, 5 insertions, 0 deletions
diff --git a/.icons/awkward/16x16/emblems/vcs-conflicting.svg b/.icons/awkward/16x16/emblems/vcs-conflicting.svg
new file mode 100644
index 00000000..7a55bf84
--- /dev/null
+++ b/.icons/awkward/16x16/emblems/vcs-conflicting.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" version="1.1">
+ <circle style="fill:#f44336" cx="8" cy="8" r="7"/>
+ <rect style="fill:#ffffff" width="2" height="10" x="-.98" y="-16.29" transform="rotate(135)"/>
+ <rect style="fill:#ffffff" width="2" height="10" x="-12.29" y="-5.01" transform="rotate(-135)"/>
+</svg>