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