Fixed input-error SVG containing SVN collision data somehow

Made the update icon look slightly nicer

git-svn-id: http://svn.dmdirc.com/trunk@2528 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/res/source/input-error.svg

@@ -57,11 +57,7 @@
      inkscape:groupmode="layer">
     <path
        sodipodi:type="arc"
-<<<<<<< .mine
        style="fill:#d40000;stroke:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
-=======
-       style="fill:#d40000;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
->>>>>>> .r2443
        id="path2168"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"
@@ -71,11 +67,7 @@
        transform="matrix(0.9600389,0,0,0.9600389,0.3047411,0.2048888)" />
     <path
        sodipodi:type="arc"
-<<<<<<< .mine
        style="fill:#b60000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
-=======
-       style="fill:#800000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
->>>>>>> .r2443
        id="path4116"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"
@@ -89,7 +81,6 @@
        inkscape:transform-center-y="-2.0722772" />
     <path
        sodipodi:type="arc"
-<<<<<<< .mine
        style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
        id="path7212"
        sodipodi:cx="8.0638618"
@@ -103,21 +94,6 @@
     <path
        sodipodi:type="arc"
        style="fill:none;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
-=======
-       style="fill:#eb0000;fill-opacity:1;stroke-width:0.607189;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path7212"
-       sodipodi:cx="8.0638618"
-       sodipodi:cy="8.0712872"
-       sodipodi:rx="6.9826732"
-       sodipodi:ry="6.9826732"
-       d="M 1.1056779,8.6555825 A 6.9826732,6.9826732 0 0 1 11.764117,2.1496458 L 8.0638618,8.0712872 z"
-       transform="matrix(0.9600389,0,0,0.9600389,0.2574227,0.2142829)"
-       sodipodi:start="3.0578168"
-       sodipodi:end="5.2708947" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:0.52081227;stroke-miterlimit:4;stroke-dasharray:none"
->>>>>>> .r2443
        id="path4118"
        sodipodi:cx="8.0638618"
        sodipodi:cy="8.0712872"

src/com/dmdirc/res/source/update.svg

@@ -1,73 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg2160"
-   sodipodi:version="0.32"
-   inkscape:version="0.45"
-   sodipodi:docname="update.svg"
-   sodipodi:docbase="/home/chris/DMDirc/trunk/src/com/dmdirc/res"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   sodipodi:modified="true">
+   version="1.0"
+   width="16"
+   height="16"
+   id="svg2160">
   <defs
      id="defs2162" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="756"
-     inkscape:window-height="590"
-     inkscape:window-x="291"
-     inkscape:window-y="140" />
-  <metadata
-     id="metadata2165">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
-       id="rect2168"
-       width="13.866337"
-       height="13.963861"
-       x="1"
-       y="1"
-       rx="1.5010651"
-       ry="1.5119057" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.549505,12.937128 L 7.549505,3.9371287 L 7.549505,12.937128 z "
-       id="path2172" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.5945545,3.9549505 L 4.5945545,6.9549505 L 7.5945545,3.9549505 L 10.594554,6.9549505 L 7.5945545,3.9549505 z "
-       id="path2174" />
+       width="14.386789"
+       height="14.309261"
+       rx="1.5010653"
+       ry="1.5119057"
+       x="0.33432937"
+       y="0.37938178"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.39999998;stroke-opacity:1"
+       id="rect2168" />
+    <g
+       transform="matrix(1.0311364,0,0,1.0311162,-0.1483015,-0.7552213)"
+       style="fill:none;stroke:#000000;stroke-width:1.07029939"
+       id="g4098">
+      <path
+         d="M 7.549505,12.937128 L 7.549505,3.9371287 L 7.549505,12.937128 z "
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.96981341px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path2172" />
+      <path
+         d="M 7.5945545,3.9549505 L 4.5945545,6.9549505 L 7.5945545,3.9549505 L 10.594554,6.9549505 L 7.5945545,3.9549505 z "
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.96981341px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path2174" />
+    </g>
   </g>
 </svg>