bos@103: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
bos@103: <!-- Created with Inkscape (http://www.inkscape.org/) -->
bos@103: <svg
bos@103:    xmlns:dc="http://purl.org/dc/elements/1.1/"
bos@103:    xmlns:cc="http://web.resource.org/cc/"
bos@103:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
bos@103:    xmlns:svg="http://www.w3.org/2000/svg"
bos@103:    xmlns="http://www.w3.org/2000/svg"
bos@103:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
bos@103:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
bos@103:    width="744.09448819"
bos@103:    height="1052.3622047"
bos@103:    id="svg2"
bos@103:    sodipodi:version="0.32"
bos@103:    inkscape:version="0.44.1"
bos@103:    sodipodi:docname="tour-merge-conflict.svg">
bos@103:   <defs
bos@103:      id="defs4">
bos@103:     <marker
bos@103:        inkscape:stockid="Arrow1Mend"
bos@103:        orient="auto"
bos@103:        refY="0.0"
bos@103:        refX="0.0"
bos@103:        id="Arrow1Mend"
bos@103:        style="overflow:visible;">
bos@103:       <path
bos@103:          id="path3053"
bos@103:          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 "
bos@103:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
bos@103:          transform="scale(0.4) rotate(180) translate(10,0)" />
bos@103:     </marker>
bos@103:   </defs>
bos@103:   <sodipodi:namedview
bos@103:      id="base"
bos@103:      pagecolor="#ffffff"
bos@103:      bordercolor="#666666"
bos@103:      borderopacity="1.0"
bos@103:      gridtolerance="10000"
bos@103:      guidetolerance="10"
bos@103:      objecttolerance="10"
bos@103:      inkscape:pageopacity="0.0"
bos@103:      inkscape:pageshadow="2"
bos@103:      inkscape:zoom="1.4"
bos@103:      inkscape:cx="164.78349"
bos@103:      inkscape:cy="590.07679"
bos@103:      inkscape:document-units="px"
bos@103:      inkscape:current-layer="layer1"
bos@103:      inkscape:window-width="906"
bos@103:      inkscape:window-height="620"
bos@103:      inkscape:window-x="5"
bos@103:      inkscape:window-y="49" />
bos@103:   <metadata
bos@103:      id="metadata7">
bos@103:     <rdf:RDF>
bos@103:       <cc:Work
bos@103:          rdf:about="">
bos@103:         <dc:format>image/svg+xml</dc:format>
bos@103:         <dc:type
bos@103:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
bos@103:       </cc:Work>
bos@103:     </rdf:RDF>
bos@103:   </metadata>
bos@103:   <g
bos@103:      inkscape:label="Layer 1"
bos@103:      inkscape:groupmode="layer"
bos@103:      id="layer1">
bos@103:     <g
bos@103:        id="g1988"
bos@103:        transform="translate(84.85711,0)">
bos@103:       <g
bos@103:          id="g1876">
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            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 "
bos@103:            id="path1872"
bos@103:            sodipodi:nodetypes="cccccc" />
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
bos@103:            id="path1874"
bos@103:            sodipodi:nodetypes="cccc" />
bos@103:       </g>
bos@103:       <flowRoot
bos@103:          style="font-size:8px;font-family:Times New Roman"
bos@103:          id="flowRoot1898"
bos@103:          xml:space="preserve"><flowRegion
bos@103:            id="flowRegion1900"><rect
bos@103:              style="font-size:8px;font-family:Times New Roman"
bos@103:              y="464.50504"
bos@103:              x="122.85714"
bos@103:              height="93.571426"
bos@103:              width="76.428574"
bos@103:              id="rect1902" /></flowRegion><flowPara
bos@103:            id="flowPara1904">Greetings!</flowPara><flowPara
bos@103:            id="flowPara1906" /><flowPara
bos@103:            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>
bos@103:     <g
bos@103:        id="g1966"
bos@103:        transform="translate(82,0.35715)">
bos@103:       <g
bos@103:          transform="translate(-77.85718,-140.0714)"
bos@103:          id="g1910">
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            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 "
bos@103:            id="path1912"
bos@103:            sodipodi:nodetypes="cccccc" />
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
bos@103:            id="path1914"
bos@103:            sodipodi:nodetypes="cccc" />
bos@103:       </g>
bos@103:       <flowRoot
bos@103:          transform="translate(-77.85718,-140.0714)"
bos@103:          style="font-size:8px;font-family:Times New Roman"
bos@103:          id="flowRoot1916"
bos@103:          xml:space="preserve"><flowRegion
bos@103:            id="flowRegion1918"><rect
bos@103:              style="font-size:8px;font-family:Times New Roman"
bos@103:              y="464.50504"
bos@103:              x="122.85714"
bos@103:              height="93.571426"
bos@103:              width="76.428574"
bos@103:              id="rect1920" /></flowRegion><flowPara
bos@103:            id="flowPara1922">Greetings!</flowPara><flowPara
bos@103:            id="flowPara1924" /><flowPara
bos@103:            id="flowPara1926">I am <flowSpan
bos@103:    style="font-style:italic;fill:red"
bos@103:    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>
bos@103:     <g
bos@103:        id="g1977"
bos@103:        transform="translate(81.99999,-0.35715)">
bos@103:       <g
bos@103:          transform="translate(83.57141,-139.3571)"
bos@103:          id="g1932">
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            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 "
bos@103:            id="path1934"
bos@103:            sodipodi:nodetypes="cccccc" />
bos@103:         <path
bos@103:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
bos@103:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
bos@103:            id="path1936"
bos@103:            sodipodi:nodetypes="cccc" />
bos@103:       </g>
bos@103:       <flowRoot
bos@103:          transform="translate(83.57141,-139.3571)"
bos@103:          style="font-size:8px;font-family:Times New Roman"
bos@103:          id="flowRoot1938"
bos@103:          xml:space="preserve"><flowRegion
bos@103:            id="flowRegion1940"><rect
bos@103:              style="font-size:8px;font-family:Times New Roman"
bos@103:              y="464.50504"
bos@103:              x="122.85714"
bos@103:              height="93.571426"
bos@103:              width="76.428574"
bos@103:              id="rect1942" /></flowRegion><flowPara
bos@103:            id="flowPara1944">Greetings!</flowPara><flowPara
bos@103:            id="flowPara1946" /><flowPara
bos@103:            id="flowPara1948">I am <flowSpan
bos@103:    style="font-style:italic;fill:red"
bos@103:    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>
bos@103:     <path
bos@103:        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"
bos@103:        d="M 215.502,457.71933 L 196.35507,424.5765"
bos@103:        id="path1999"
bos@103:        inkscape:connector-type="polyline"
bos@103:        inkscape:connection-start="#g1988"
bos@103:        inkscape:connection-end="#g1966" />
bos@103:     <path
bos@103:        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"
bos@103:        d="M 277.06936,457.71933 L 296.21629,424.5765"
bos@103:        id="path2001"
bos@103:        inkscape:connector-type="polyline"
bos@103:        inkscape:connection-start="#g1988"
bos@103:        inkscape:connection-end="#g1977" />
bos@103:     <text
bos@103:        xml:space="preserve"
bos@103:        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"
bos@103:        x="302.42859"
bos@103:        y="515.08905"
bos@103:        id="text1905"><tspan
bos@103:          sodipodi:role="line"
bos@103:          id="tspan1907"
bos@103:          x="302.42859"
bos@103:          y="515.08905">Base version</tspan></text>
bos@103:     <text
bos@103:        xml:space="preserve"
bos@103:        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"
bos@103:        x="45.57143"
bos@103:        y="374.1619"
bos@103:        id="text1917"><tspan
bos@103:          sodipodi:role="line"
bos@103:          id="tspan1919"
bos@103:          x="45.57143"
bos@103:          y="374.1619">Our changes</tspan></text>
bos@103:     <text
bos@103:        xml:space="preserve"
bos@103:        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"
bos@103:        x="385.71429"
bos@103:        y="374.1619"
bos@103:        id="text1921"><tspan
bos@103:          sodipodi:role="line"
bos@103:          id="tspan1923"
bos@103:          x="385.71429"
bos@103:          y="374.1619">Their changes</tspan></text>
bos@103:   </g>
bos@103: </svg>