1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/en/tour-merge-conflict.svg	Wed Oct 29 23:47:29 2008 -0500
     1.3 @@ -0,0 +1,210 @@
     1.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     1.5 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
     1.6 +<svg
     1.7 +   xmlns:dc="http://purl.org/dc/elements/1.1/"
     1.8 +   xmlns:cc="http://web.resource.org/cc/"
     1.9 +   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    1.10 +   xmlns:svg="http://www.w3.org/2000/svg"
    1.11 +   xmlns="http://www.w3.org/2000/svg"
    1.12 +   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    1.13 +   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    1.14 +   width="744.09448819"
    1.15 +   height="1052.3622047"
    1.16 +   id="svg2"
    1.17 +   sodipodi:version="0.32"
    1.18 +   inkscape:version="0.44.1"
    1.19 +   sodipodi:docname="tour-merge-conflict.svg">
    1.20 +  <defs
    1.21 +     id="defs4">
    1.22 +    <marker
    1.23 +       inkscape:stockid="Arrow1Mend"
    1.24 +       orient="auto"
    1.25 +       refY="0.0"
    1.26 +       refX="0.0"
    1.27 +       id="Arrow1Mend"
    1.28 +       style="overflow:visible;">
    1.29 +      <path
    1.30 +         id="path3053"
    1.31 +         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 "
    1.32 +         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
    1.33 +         transform="scale(0.4) rotate(180) translate(10,0)" />
    1.34 +    </marker>
    1.35 +  </defs>
    1.36 +  <sodipodi:namedview
    1.37 +     id="base"
    1.38 +     pagecolor="#ffffff"
    1.39 +     bordercolor="#666666"
    1.40 +     borderopacity="1.0"
    1.41 +     gridtolerance="10000"
    1.42 +     guidetolerance="10"
    1.43 +     objecttolerance="10"
    1.44 +     inkscape:pageopacity="0.0"
    1.45 +     inkscape:pageshadow="2"
    1.46 +     inkscape:zoom="1.4"
    1.47 +     inkscape:cx="164.78349"
    1.48 +     inkscape:cy="590.07679"
    1.49 +     inkscape:document-units="px"
    1.50 +     inkscape:current-layer="layer1"
    1.51 +     inkscape:window-width="906"
    1.52 +     inkscape:window-height="620"
    1.53 +     inkscape:window-x="5"
    1.54 +     inkscape:window-y="49" />
    1.55 +  <metadata
    1.56 +     id="metadata7">
    1.57 +    <rdf:RDF>
    1.58 +      <cc:Work
    1.59 +         rdf:about="">
    1.60 +        <dc:format>image/svg+xml</dc:format>
    1.61 +        <dc:type
    1.62 +           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
    1.63 +      </cc:Work>
    1.64 +    </rdf:RDF>
    1.65 +  </metadata>
    1.66 +  <g
    1.67 +     inkscape:label="Layer 1"
    1.68 +     inkscape:groupmode="layer"
    1.69 +     id="layer1">
    1.70 +    <g
    1.71 +       id="g1988"
    1.72 +       transform="translate(84.85711,0)">
    1.73 +      <g
    1.74 +         id="g1876">
    1.75 +        <path
    1.76 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    1.77 +           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 "
    1.78 +           id="path1872"
    1.79 +           sodipodi:nodetypes="cccccc" />
    1.80 +        <path
    1.81 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
    1.82 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
    1.83 +           id="path1874"
    1.84 +           sodipodi:nodetypes="cccc" />
    1.85 +      </g>
    1.86 +      <flowRoot
    1.87 +         style="font-size:8px;font-family:Times New Roman"
    1.88 +         id="flowRoot1898"
    1.89 +         xml:space="preserve"><flowRegion
    1.90 +           id="flowRegion1900"><rect
    1.91 +             style="font-size:8px;font-family:Times New Roman"
    1.92 +             y="464.50504"
    1.93 +             x="122.85714"
    1.94 +             height="93.571426"
    1.95 +             width="76.428574"
    1.96 +             id="rect1902" /></flowRegion><flowPara
    1.97 +           id="flowPara1904">Greetings!</flowPara><flowPara
    1.98 +           id="flowPara1906" /><flowPara
    1.99 +           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>
   1.100 +    <g
   1.101 +       id="g1966"
   1.102 +       transform="translate(82,0.35715)">
   1.103 +      <g
   1.104 +         transform="translate(-77.85718,-140.0714)"
   1.105 +         id="g1910">
   1.106 +        <path
   1.107 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.108 +           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 "
   1.109 +           id="path1912"
   1.110 +           sodipodi:nodetypes="cccccc" />
   1.111 +        <path
   1.112 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.113 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
   1.114 +           id="path1914"
   1.115 +           sodipodi:nodetypes="cccc" />
   1.116 +      </g>
   1.117 +      <flowRoot
   1.118 +         transform="translate(-77.85718,-140.0714)"
   1.119 +         style="font-size:8px;font-family:Times New Roman"
   1.120 +         id="flowRoot1916"
   1.121 +         xml:space="preserve"><flowRegion
   1.122 +           id="flowRegion1918"><rect
   1.123 +             style="font-size:8px;font-family:Times New Roman"
   1.124 +             y="464.50504"
   1.125 +             x="122.85714"
   1.126 +             height="93.571426"
   1.127 +             width="76.428574"
   1.128 +             id="rect1920" /></flowRegion><flowPara
   1.129 +           id="flowPara1922">Greetings!</flowPara><flowPara
   1.130 +           id="flowPara1924" /><flowPara
   1.131 +           id="flowPara1926">I am <flowSpan
   1.132 +   style="font-style:italic;fill:red"
   1.133 +   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>
   1.134 +    <g
   1.135 +       id="g1977"
   1.136 +       transform="translate(81.99999,-0.35715)">
   1.137 +      <g
   1.138 +         transform="translate(83.57141,-139.3571)"
   1.139 +         id="g1932">
   1.140 +        <path
   1.141 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.142 +           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 "
   1.143 +           id="path1934"
   1.144 +           sodipodi:nodetypes="cccccc" />
   1.145 +        <path
   1.146 +           style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
   1.147 +           d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
   1.148 +           id="path1936"
   1.149 +           sodipodi:nodetypes="cccc" />
   1.150 +      </g>
   1.151 +      <flowRoot
   1.152 +         transform="translate(83.57141,-139.3571)"
   1.153 +         style="font-size:8px;font-family:Times New Roman"
   1.154 +         id="flowRoot1938"
   1.155 +         xml:space="preserve"><flowRegion
   1.156 +           id="flowRegion1940"><rect
   1.157 +             style="font-size:8px;font-family:Times New Roman"
   1.158 +             y="464.50504"
   1.159 +             x="122.85714"
   1.160 +             height="93.571426"
   1.161 +             width="76.428574"
   1.162 +             id="rect1942" /></flowRegion><flowPara
   1.163 +           id="flowPara1944">Greetings!</flowPara><flowPara
   1.164 +           id="flowPara1946" /><flowPara
   1.165 +           id="flowPara1948">I am <flowSpan
   1.166 +   style="font-style:italic;fill:red"
   1.167 +   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>
   1.168 +    <path
   1.169 +       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"
   1.170 +       d="M 215.502,457.71933 L 196.35507,424.5765"
   1.171 +       id="path1999"
   1.172 +       inkscape:connector-type="polyline"
   1.173 +       inkscape:connection-start="#g1988"
   1.174 +       inkscape:connection-end="#g1966" />
   1.175 +    <path
   1.176 +       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"
   1.177 +       d="M 277.06936,457.71933 L 296.21629,424.5765"
   1.178 +       id="path2001"
   1.179 +       inkscape:connector-type="polyline"
   1.180 +       inkscape:connection-start="#g1988"
   1.181 +       inkscape:connection-end="#g1977" />
   1.182 +    <text
   1.183 +       xml:space="preserve"
   1.184 +       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"
   1.185 +       x="302.42859"
   1.186 +       y="515.08905"
   1.187 +       id="text1905"><tspan
   1.188 +         sodipodi:role="line"
   1.189 +         id="tspan1907"
   1.190 +         x="302.42859"
   1.191 +         y="515.08905">Base version</tspan></text>
   1.192 +    <text
   1.193 +       xml:space="preserve"
   1.194 +       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"
   1.195 +       x="45.57143"
   1.196 +       y="374.1619"
   1.197 +       id="text1917"><tspan
   1.198 +         sodipodi:role="line"
   1.199 +         id="tspan1919"
   1.200 +         x="45.57143"
   1.201 +         y="374.1619">Our changes</tspan></text>
   1.202 +    <text
   1.203 +       xml:space="preserve"
   1.204 +       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"
   1.205 +       x="385.71429"
   1.206 +       y="374.1619"
   1.207 +       id="text1921"><tspan
   1.208 +         sodipodi:role="line"
   1.209 +         id="tspan1923"
   1.210 +         x="385.71429"
   1.211 +         y="374.1619">Their changes</tspan></text>
   1.212 +  </g>
   1.213 +</svg>