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