aboutsummaryrefslogtreecommitdiff
path: root/.icons/awkward/48x48/emblems/vcs-conflicting.svg
diff options
context:
space:
mode:
Diffstat (limited to '.icons/awkward/48x48/emblems/vcs-conflicting.svg')
-rw-r--r--.icons/awkward/48x48/emblems/vcs-conflicting.svg4
1 files changed, 4 insertions, 0 deletions
diff --git a/.icons/awkward/48x48/emblems/vcs-conflicting.svg b/.icons/awkward/48x48/emblems/vcs-conflicting.svg
new file mode 100644
index 00000000..33dcd145
--- /dev/null
+++ b/.icons/awkward/48x48/emblems/vcs-conflicting.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" version="1.1">
+ <circle style="fill:#f44336" cx="24" cy="24" r="20"/>
+ <path style="fill:#ffffff" d="M 15.5,11.5 24,20 32.5,11.5 36.5,15.5 28,24 36.5,32.5 32.5,36.5 24,28 15.5,36.5 11.5,32.5 20,24 11.5,15.5 Z"/>
+</svg>