hgbook

annotate ja/tour-merge-conflict.svg @ 866:e92129e826ca

find changesets by author, revision, files, or words in the commit message
Added tag 1st-edition-it for changeset 94d2205f02e7
author gpiancastelli
date Fri Sep 04 15:06:54 2009 +0200 (2009-09-04)
parents
children
rev   line source
foozy@708 1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
foozy@708 2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
foozy@708 3 <svg
foozy@708 4 xmlns:dc="http://purl.org/dc/elements/1.1/"
foozy@708 5 xmlns:cc="http://web.resource.org/cc/"
foozy@708 6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
foozy@708 7 xmlns:svg="http://www.w3.org/2000/svg"
foozy@708 8 xmlns="http://www.w3.org/2000/svg"
foozy@708 9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
foozy@708 10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
foozy@708 11 width="744.09448819"
foozy@708 12 height="1052.3622047"
foozy@708 13 id="svg2"
foozy@708 14 sodipodi:version="0.32"
foozy@708 15 inkscape:version="0.44.1"
foozy@708 16 sodipodi:docname="tour-merge-conflict.svg">
foozy@708 17 <defs
foozy@708 18 id="defs4">
foozy@708 19 <marker
foozy@708 20 inkscape:stockid="Arrow1Mend"
foozy@708 21 orient="auto"
foozy@708 22 refY="0.0"
foozy@708 23 refX="0.0"
foozy@708 24 id="Arrow1Mend"
foozy@708 25 style="overflow:visible;">
foozy@708 26 <path
foozy@708 27 id="path3053"
foozy@708 28 d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
foozy@708 29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
foozy@708 30 transform="scale(0.4) rotate(180) translate(10,0)" />
foozy@708 31 </marker>
foozy@708 32 </defs>
foozy@708 33 <sodipodi:namedview
foozy@708 34 id="base"
foozy@708 35 pagecolor="#ffffff"
foozy@708 36 bordercolor="#666666"
foozy@708 37 borderopacity="1.0"
foozy@708 38 gridtolerance="10000"
foozy@708 39 guidetolerance="10"
foozy@708 40 objecttolerance="10"
foozy@708 41 inkscape:pageopacity="0.0"
foozy@708 42 inkscape:pageshadow="2"
foozy@708 43 inkscape:zoom="1.4"
foozy@708 44 inkscape:cx="164.78349"
foozy@708 45 inkscape:cy="590.07679"
foozy@708 46 inkscape:document-units="px"
foozy@708 47 inkscape:current-layer="layer1"
foozy@708 48 inkscape:window-width="906"
foozy@708 49 inkscape:window-height="620"
foozy@708 50 inkscape:window-x="5"
foozy@708 51 inkscape:window-y="49" />
foozy@708 52 <metadata
foozy@708 53 id="metadata7">
foozy@708 54 <rdf:RDF>
foozy@708 55 <cc:Work
foozy@708 56 rdf:about="">
foozy@708 57 <dc:format>image/svg+xml</dc:format>
foozy@708 58 <dc:type
foozy@708 59 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
foozy@708 60 </cc:Work>
foozy@708 61 </rdf:RDF>
foozy@708 62 </metadata>
foozy@708 63 <g
foozy@708 64 inkscape:label="Layer 1"
foozy@708 65 inkscape:groupmode="layer"
foozy@708 66 id="layer1">
foozy@708 67 <g
foozy@708 68 id="g1988"
foozy@708 69 transform="translate(84.85711,0)">
foozy@708 70 <g
foozy@708 71 id="g1876">
foozy@708 72 <path
foozy@708 73 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 74 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
foozy@708 75 id="path1872"
foozy@708 76 sodipodi:nodetypes="cccccc" />
foozy@708 77 <path
foozy@708 78 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 79 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
foozy@708 80 id="path1874"
foozy@708 81 sodipodi:nodetypes="cccc" />
foozy@708 82 </g>
foozy@708 83 <flowRoot
foozy@708 84 style="font-size:8px;font-family:Times New Roman"
foozy@708 85 id="flowRoot1898"
foozy@708 86 xml:space="preserve"><flowRegion
foozy@708 87 id="flowRegion1900"><rect
foozy@708 88 style="font-size:8px;font-family:Times New Roman"
foozy@708 89 y="464.50504"
foozy@708 90 x="122.85714"
foozy@708 91 height="93.571426"
foozy@708 92 width="76.428574"
foozy@708 93 id="rect1902" /></flowRegion><flowPara
foozy@708 94 id="flowPara1904">Greetings!</flowPara><flowPara
foozy@708 95 id="flowPara1906" /><flowPara
foozy@708 96 id="flowPara1908">I am Mariam Abacha, the wife of former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g>
foozy@708 97 <g
foozy@708 98 id="g1966"
foozy@708 99 transform="translate(82,0.35715)">
foozy@708 100 <g
foozy@708 101 transform="translate(-77.85718,-140.0714)"
foozy@708 102 id="g1910">
foozy@708 103 <path
foozy@708 104 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 105 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
foozy@708 106 id="path1912"
foozy@708 107 sodipodi:nodetypes="cccccc" />
foozy@708 108 <path
foozy@708 109 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 110 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
foozy@708 111 id="path1914"
foozy@708 112 sodipodi:nodetypes="cccc" />
foozy@708 113 </g>
foozy@708 114 <flowRoot
foozy@708 115 transform="translate(-77.85718,-140.0714)"
foozy@708 116 style="font-size:8px;font-family:Times New Roman"
foozy@708 117 id="flowRoot1916"
foozy@708 118 xml:space="preserve"><flowRegion
foozy@708 119 id="flowRegion1918"><rect
foozy@708 120 style="font-size:8px;font-family:Times New Roman"
foozy@708 121 y="464.50504"
foozy@708 122 x="122.85714"
foozy@708 123 height="93.571426"
foozy@708 124 width="76.428574"
foozy@708 125 id="rect1920" /></flowRegion><flowPara
foozy@708 126 id="flowPara1922">Greetings!</flowPara><flowPara
foozy@708 127 id="flowPara1924" /><flowPara
foozy@708 128 id="flowPara1926">I am <flowSpan
foozy@708 129 style="font-style:italic;fill:red"
foozy@708 130 id="flowSpan3094">Shehu Musa Abacha, cousin to</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g>
foozy@708 131 <g
foozy@708 132 id="g1977"
foozy@708 133 transform="translate(81.99999,-0.35715)">
foozy@708 134 <g
foozy@708 135 transform="translate(83.57141,-139.3571)"
foozy@708 136 id="g1932">
foozy@708 137 <path
foozy@708 138 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 139 d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z "
foozy@708 140 id="path1934"
foozy@708 141 sodipodi:nodetypes="cccccc" />
foozy@708 142 <path
foozy@708 143 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
foozy@708 144 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
foozy@708 145 id="path1936"
foozy@708 146 sodipodi:nodetypes="cccc" />
foozy@708 147 </g>
foozy@708 148 <flowRoot
foozy@708 149 transform="translate(83.57141,-139.3571)"
foozy@708 150 style="font-size:8px;font-family:Times New Roman"
foozy@708 151 id="flowRoot1938"
foozy@708 152 xml:space="preserve"><flowRegion
foozy@708 153 id="flowRegion1940"><rect
foozy@708 154 style="font-size:8px;font-family:Times New Roman"
foozy@708 155 y="464.50504"
foozy@708 156 x="122.85714"
foozy@708 157 height="93.571426"
foozy@708 158 width="76.428574"
foozy@708 159 id="rect1942" /></flowRegion><flowPara
foozy@708 160 id="flowPara1944">Greetings!</flowPara><flowPara
foozy@708 161 id="flowPara1946" /><flowPara
foozy@708 162 id="flowPara1948">I am <flowSpan
foozy@708 163 style="font-style:italic;fill:red"
foozy@708 164 id="flowSpan3096">Alhaji Abba Abacha, son of</flowSpan> the former Nigerian dictator Sani Abacha. I am contacting you in confidence, and as a means of developing</flowPara></flowRoot> </g>
foozy@708 165 <path
foozy@708 166 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
foozy@708 167 d="M 215.502,457.71933 L 196.35507,424.5765"
foozy@708 168 id="path1999"
foozy@708 169 inkscape:connector-type="polyline"
foozy@708 170 inkscape:connection-start="#g1988"
foozy@708 171 inkscape:connection-end="#g1966" />
foozy@708 172 <path
foozy@708 173 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1"
foozy@708 174 d="M 277.06936,457.71933 L 296.21629,424.5765"
foozy@708 175 id="path2001"
foozy@708 176 inkscape:connector-type="polyline"
foozy@708 177 inkscape:connection-start="#g1988"
foozy@708 178 inkscape:connection-end="#g1977" />
foozy@708 179 <text
foozy@708 180 xml:space="preserve"
foozy@708 181 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
foozy@708 182 x="302.42859"
foozy@708 183 y="515.08905"
foozy@708 184 id="text1905"><tspan
foozy@708 185 sodipodi:role="line"
foozy@708 186 id="tspan1907"
foozy@708 187 x="302.42859"
foozy@708 188 y="515.08905">Base version</tspan></text>
foozy@708 189 <text
foozy@708 190 xml:space="preserve"
foozy@708 191 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
foozy@708 192 x="45.57143"
foozy@708 193 y="374.1619"
foozy@708 194 id="text1917"><tspan
foozy@708 195 sodipodi:role="line"
foozy@708 196 id="tspan1919"
foozy@708 197 x="45.57143"
foozy@708 198 y="374.1619">Our changes</tspan></text>
foozy@708 199 <text
foozy@708 200 xml:space="preserve"
foozy@708 201 style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
foozy@708 202 x="385.71429"
foozy@708 203 y="374.1619"
foozy@708 204 id="text1921"><tspan
foozy@708 205 sodipodi:role="line"
foozy@708 206 id="tspan1923"
foozy@708 207 x="385.71429"
foozy@708 208 y="374.1619">Their changes</tspan></text>
foozy@708 209 </g>
foozy@708 210 </svg>