| [1620] | 1 | <?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|---|
| 2 | <!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|---|
| 3 | <svg
|
|---|
| 4 | xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|---|
| 5 | xmlns:cc="http://creativecommons.org/ns#"
|
|---|
| 6 | xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|---|
| 7 | xmlns:svg="http://www.w3.org/2000/svg"
|
|---|
| 8 | xmlns="http://www.w3.org/2000/svg"
|
|---|
| 9 | xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|---|
| 10 | xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|---|
| 11 | width="16"
|
|---|
| 12 | height="16"
|
|---|
| 13 | id="svg2"
|
|---|
| 14 | sodipodi:version="0.32"
|
|---|
| 15 | inkscape:version="0.46"
|
|---|
| 16 | version="1.0"
|
|---|
| 17 | sodipodi:docname="mergeincomplete.svg"
|
|---|
| 18 | inkscape:output_extension="org.inkscape.output.svg.inkscape"
|
|---|
| 19 | inkscape:export-filename="C:\data\projekte\eclipse-3.4.1-ws\JOSM\images\dialogs\conflict\mergecomplete.png"
|
|---|
| 20 | inkscape:export-xdpi="90"
|
|---|
| 21 | inkscape:export-ydpi="90">
|
|---|
| 22 | <defs
|
|---|
| 23 | id="defs4">
|
|---|
| 24 | <inkscape:perspective
|
|---|
| 25 | sodipodi:type="inkscape:persp3d"
|
|---|
| 26 | inkscape:vp_x="0 : 526.18109 : 1"
|
|---|
| 27 | inkscape:vp_y="0 : 1000 : 0"
|
|---|
| 28 | inkscape:vp_z="744.09448 : 526.18109 : 1"
|
|---|
| 29 | inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
|
|---|
| 30 | id="perspective10" />
|
|---|
| 31 | </defs>
|
|---|
| 32 | <sodipodi:namedview
|
|---|
| 33 | id="base"
|
|---|
| 34 | pagecolor="#ffffff"
|
|---|
| 35 | bordercolor="#666666"
|
|---|
| 36 | borderopacity="1.0"
|
|---|
| 37 | inkscape:pageopacity="0.0"
|
|---|
| 38 | inkscape:pageshadow="2"
|
|---|
| 39 | inkscape:zoom="15.839192"
|
|---|
| 40 | inkscape:cx="1.7844983"
|
|---|
| 41 | inkscape:cy="13.711502"
|
|---|
| 42 | inkscape:document-units="px"
|
|---|
| 43 | inkscape:current-layer="layer1"
|
|---|
| 44 | showgrid="false"
|
|---|
| 45 | inkscape:window-width="994"
|
|---|
| 46 | inkscape:window-height="764"
|
|---|
| 47 | inkscape:window-x="115"
|
|---|
| 48 | inkscape:window-y="115" />
|
|---|
| 49 | <metadata
|
|---|
| 50 | id="metadata7">
|
|---|
| 51 | <rdf:RDF>
|
|---|
| 52 | <cc:Work
|
|---|
| 53 | rdf:about="">
|
|---|
| 54 | <dc:format>image/svg+xml</dc:format>
|
|---|
| 55 | <dc:type
|
|---|
| 56 | rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|---|
| 57 | </cc:Work>
|
|---|
| 58 | </rdf:RDF>
|
|---|
| 59 | </metadata>
|
|---|
| 60 | <g
|
|---|
| 61 | inkscape:label="Ebene 1"
|
|---|
| 62 | inkscape:groupmode="layer"
|
|---|
| 63 | id="layer1">
|
|---|
| 64 | <rect
|
|---|
| 65 | style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
|---|
| 66 | id="rect3177"
|
|---|
| 67 | width="9.7858524"
|
|---|
| 68 | height="8.5231619"
|
|---|
| 69 | x="3.1567266"
|
|---|
| 70 | y="3.8150349" />
|
|---|
| 71 | </g>
|
|---|
| 72 | </svg>
|
|---|
![[1620]](/changeset/1620/josm/trunk/images/dialogs/conflict/mergeincomplete.svg){kind=link}
