igor@333: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
igor@333: <!-- Created with Inkscape (http://www.inkscape.org/) -->
igor@333: <svg
igor@333:    xmlns:dc="http://purl.org/dc/elements/1.1/"
igor@333:    xmlns:cc="http://creativecommons.org/ns#"
igor@333:    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
igor@333:    xmlns:svg="http://www.w3.org/2000/svg"
igor@333:    xmlns="http://www.w3.org/2000/svg"
igor@333:    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
igor@333:    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
igor@333:    width="744.09448819"
igor@333:    height="1052.3622047"
igor@333:    id="svg2"
igor@333:    sodipodi:version="0.32"
igor@333:    inkscape:version="0.46"
igor@333:    sodipodi:docname="tour-merge-conflict.svg"
igor@333:    inkscape:output_extension="org.inkscape.output.svg.inkscape">
igor@333:   <defs
igor@333:      id="defs4">
igor@333:     <inkscape:perspective
igor@333:        sodipodi:type="inkscape:persp3d"
igor@333:        inkscape:vp_x="0 : 526.18109 : 1"
igor@333:        inkscape:vp_y="0 : 1000 : 0"
igor@333:        inkscape:vp_z="744.09448 : 526.18109 : 1"
igor@333:        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
igor@333:        id="perspective2861" />
igor@333:     <marker
igor@333:        inkscape:stockid="Arrow1Mend"
igor@333:        orient="auto"
igor@333:        refY="0.0"
igor@333:        refX="0.0"
igor@333:        id="Arrow1Mend"
igor@333:        style="overflow:visible;">
igor@333:       <path
igor@333:          id="path3053"
igor@333:          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 "
igor@333:          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
igor@333:          transform="scale(0.4) rotate(180) translate(10,0)" />
igor@333:     </marker>
igor@333:   </defs>
igor@333:   <sodipodi:namedview
igor@333:      id="base"
igor@333:      pagecolor="#ffffff"
igor@333:      bordercolor="#666666"
igor@333:      borderopacity="1.0"
igor@333:      gridtolerance="10000"
igor@333:      guidetolerance="10"
igor@333:      objecttolerance="10"
igor@333:      inkscape:pageopacity="0.0"
igor@333:      inkscape:pageshadow="2"
igor@333:      inkscape:zoom="1.4"
igor@333:      inkscape:cx="251.65243"
igor@333:      inkscape:cy="733.42197"
igor@333:      inkscape:document-units="px"
igor@333:      inkscape:current-layer="layer1"
igor@333:      inkscape:window-width="906"
igor@333:      inkscape:window-height="659"
igor@333:      inkscape:window-x="5"
igor@333:      inkscape:window-y="49"
igor@333:      showgrid="false" />
igor@333:   <metadata
igor@333:      id="metadata7">
igor@333:     <rdf:RDF>
igor@333:       <cc:Work
igor@333:          rdf:about="">
igor@333:         <dc:format>image/svg+xml</dc:format>
igor@333:         <dc:type
igor@333:            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
igor@333:       </cc:Work>
igor@333:     </rdf:RDF>
igor@333:   </metadata>
igor@333:   <g
igor@333:      inkscape:label="Layer 1"
igor@333:      inkscape:groupmode="layer"
igor@333:      id="layer1">
igor@333:     <g
igor@333:        id="g1988"
igor@333:        transform="translate(84.85711,0)">
igor@333:       <g
igor@333:          id="g1876">
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            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 "
igor@333:            id="path1872"
igor@333:            sodipodi:nodetypes="cccccc" />
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
igor@333:            id="path1874"
igor@333:            sodipodi:nodetypes="cccc" />
igor@333:       </g>
igor@333:       <flowRoot
igor@333:          style="font-size:8px;font-family:Times New Roman"
igor@333:          id="flowRoot1898"
igor@333:          xml:space="preserve"><flowRegion
igor@333:            id="flowRegion1900"><rect
igor@333:              style="font-size:8px;font-family:Times New Roman"
igor@333:              y="464.50504"
igor@333:              x="122.85714"
igor@333:              height="93.571426"
igor@333:              width="76.428574"
igor@333:              id="rect1902" /></flowRegion><flowPara
igor@333:            id="flowPara1904">Saludos!</flowPara><flowPara
igor@333:            id="flowPara1906" /><flowPara
igor@333:            id="flowPara1908">Soy Mariam Abacha, la esposa del anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
igor@333:     <g
igor@333:        id="g1966"
igor@333:        transform="translate(82,0.35715)">
igor@333:       <g
igor@333:          transform="translate(-77.85718,-140.0714)"
igor@333:          id="g1910">
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            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 "
igor@333:            id="path1912"
igor@333:            sodipodi:nodetypes="cccccc" />
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
igor@333:            id="path1914"
igor@333:            sodipodi:nodetypes="cccc" />
igor@333:       </g>
igor@333:       <flowRoot
igor@333:          transform="translate(-77.85718,-140.0714)"
igor@333:          style="font-size:8px;font-family:Times New Roman"
igor@333:          id="flowRoot1916"
igor@333:          xml:space="preserve"><flowRegion
igor@333:            id="flowRegion1918"><rect
igor@333:              style="font-size:8px;font-family:Times New Roman"
igor@333:              y="464.50504"
igor@333:              x="122.85714"
igor@333:              height="93.571426"
igor@333:              width="76.428574"
igor@333:              id="rect1920" /></flowRegion><flowPara
igor@333:            id="flowPara1922">Saludos!</flowPara><flowPara
igor@333:            id="flowPara1924" /><flowPara
igor@333:            id="flowPara1926">Soy <flowSpan
igor@333:    style="font-style:italic;fill:#ff0000"
igor@333:    id="flowSpan3094">Shehu Musa Abacha, sobrina del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
igor@333:     <g
igor@333:        id="g1977"
igor@333:        transform="translate(81.99999,-0.35715)">
igor@333:       <g
igor@333:          transform="translate(83.57141,-139.3571)"
igor@333:          id="g1932">
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            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 "
igor@333:            id="path1934"
igor@333:            sodipodi:nodetypes="cccccc" />
igor@333:         <path
igor@333:            style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
igor@333:            d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
igor@333:            id="path1936"
igor@333:            sodipodi:nodetypes="cccc" />
igor@333:       </g>
igor@333:       <flowRoot
igor@333:          transform="translate(83.57141,-139.3571)"
igor@333:          style="font-size:8px;font-family:Times New Roman"
igor@333:          id="flowRoot1938"
igor@333:          xml:space="preserve"><flowRegion
igor@333:            id="flowRegion1940"><rect
igor@333:              style="font-size:8px;font-family:Times New Roman"
igor@333:              y="464.50504"
igor@333:              x="122.85714"
igor@333:              height="93.571426"
igor@333:              width="76.428574"
igor@333:              id="rect1942" /></flowRegion><flowPara
igor@333:            id="flowPara1944">Saludos!</flowPara><flowPara
igor@333:            id="flowPara1946" /><flowPara
igor@333:            id="flowPara1948">Soy <flowSpan
igor@333:    style="font-style:italic;fill:#ff0000"
igor@333:    id="flowSpan3096">Alhaji Abba Abacha, hijo del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot>    </g>
igor@333:     <path
igor@333:        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"
igor@333:        d="M 215.502,457.71933 L 196.35507,424.5765"
igor@333:        id="path1999"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-start="#g1988"
igor@333:        inkscape:connection-end="#g1966" />
igor@333:     <path
igor@333:        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"
igor@333:        d="M 277.06936,457.71933 L 296.21629,424.5765"
igor@333:        id="path2001"
igor@333:        inkscape:connector-type="polyline"
igor@333:        inkscape:connection-start="#g1988"
igor@333:        inkscape:connection-end="#g1977" />
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="302.42859"
igor@333:        y="515.08905"
igor@333:        id="text1905"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan1907"
igor@333:          x="302.42859"
igor@333:          y="515.08905">Versión inicial</tspan></text>
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="30.57143"
igor@333:        y="374.1619"
igor@333:        id="text1917"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan1919"
igor@333:          x="30.57143"
igor@333:          y="374.1619">Nuestros cambios</tspan></text>
igor@333:     <text
igor@333:        xml:space="preserve"
igor@333:        style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman"
igor@333:        x="385.71429"
igor@333:        y="374.1619"
igor@333:        id="text1921"><tspan
igor@333:          sodipodi:role="line"
igor@333:          id="tspan1923"
igor@333:          x="385.71429"
igor@333:          y="374.1619">Sus cambios</tspan></text>
igor@333:   </g>
igor@333: </svg>