|
@@ -57,7 +57,11 @@
|
57
|
57
|
inkscape:groupmode="layer">
|
58
|
58
|
<path
|
59
|
59
|
sodipodi:type="arc"
|
|
60
|
+<<<<<<< .mine
|
|
61
|
+ style="fill:#d40000;stroke:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
|
|
62
|
+=======
|
60
|
63
|
style="fill:#d40000;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
|
|
64
|
+>>>>>>> .r2443
|
61
|
65
|
id="path2168"
|
62
|
66
|
sodipodi:cx="8.0638618"
|
63
|
67
|
sodipodi:cy="8.0712872"
|
|
@@ -67,7 +71,11 @@
|
67
|
71
|
transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048888)" />
|
68
|
72
|
<path
|
69
|
73
|
sodipodi:type="arc"
|
|
74
|
+<<<<<<< .mine
|
|
75
|
+ style="fill:#b60000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
|
|
76
|
+=======
|
70
|
77
|
style="fill:#800000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
|
|
78
|
+>>>>>>> .r2443
|
71
|
79
|
id="path4116"
|
72
|
80
|
sodipodi:cx="8.0638618"
|
73
|
81
|
sodipodi:cy="8.0712872"
|
|
@@ -76,9 +84,26 @@
|
76
|
84
|
d="M 15.046535,8.0712872 A 6.9826732,6.9826732 0 0 1 3.1870561,13.068736 L 8.0638618,8.0712872 z"
|
77
|
85
|
transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048882)"
|
78
|
86
|
sodipodi:start="0"
|
79
|
|
- sodipodi:end="2.3439772" />
|
|
87
|
+ sodipodi:end="2.3439772"
|
|
88
|
+ inkscape:transform-center-x="2.1173267"
|
|
89
|
+ inkscape:transform-center-y="-2.0722772" />
|
80
|
90
|
<path
|
81
|
91
|
sodipodi:type="arc"
|
|
92
|
+<<<<<<< .mine
|
|
93
|
+ style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
|
|
94
|
+ id="path7212"
|
|
95
|
+ sodipodi:cx="8.0638618"
|
|
96
|
+ sodipodi:cy="8.0712872"
|
|
97
|
+ sodipodi:rx="6.9826732"
|
|
98
|
+ sodipodi:ry="6.9826732"
|
|
99
|
+ d="M 1.1056779,8.6555825 A 6.9826732,6.9826732 0 0 1 11.764117,2.1496458 L 8.0638618,8.0712872 z"
|
|
100
|
+ transform="matrix(0.9600389,0,0,0.9600389,0.2574227,0.2142829)"
|
|
101
|
+ sodipodi:start="3.0578168"
|
|
102
|
+ sodipodi:end="5.2708947" />
|
|
103
|
+ <path
|
|
104
|
+ sodipodi:type="arc"
|
|
105
|
+ style="fill:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
|
|
106
|
+=======
|
82
|
107
|
style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
|
83
|
108
|
id="path7212"
|
84
|
109
|
sodipodi:cx="8.0638618"
|
|
@@ -92,6 +117,7 @@
|
92
|
117
|
<path
|
93
|
118
|
sodipodi:type="arc"
|
94
|
119
|
style="fill:none;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
|
|
120
|
+>>>>>>> .r2443
|
95
|
121
|
id="path4118"
|
96
|
122
|
sodipodi:cx="8.0638618"
|
97
|
123
|
sodipodi:cy="8.0712872"
|