|
103
|
1 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
|
2 <!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
|
3 <svg
|
|
|
4 xmlns:dc="http://purl.org/dc/elements/1.1/"
|
|
|
5 xmlns:cc="http://web.resource.org/cc/"
|
|
|
6 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
|
|
7 xmlns:svg="http://www.w3.org/2000/svg"
|
|
|
8 xmlns="http://www.w3.org/2000/svg"
|
|
|
9 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
|
10 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
|
11 width="744.09448819"
|
|
|
12 height="1052.3622047"
|
|
|
13 id="svg2"
|
|
|
14 sodipodi:version="0.32"
|
|
|
15 inkscape:version="0.44.1"
|
|
|
16 sodipodi:docname="tour-merge-conflict.svg">
|
|
|
17 <defs
|
|
|
18 id="defs4">
|
|
|
19 <marker
|
|
|
20 inkscape:stockid="Arrow1Mend"
|
|
|
21 orient="auto"
|
|
|
22 refY="0.0"
|
|
|
23 refX="0.0"
|
|
|
24 id="Arrow1Mend"
|
|
|
25 style="overflow:visible;">
|
|
|
26 <path
|
|
|
27 id="path3053"
|
|
|
28 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 "
|
|
|
29 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
|
|
|
30 transform="scale(0.4) rotate(180) translate(10,0)" />
|
|
|
31 </marker>
|
|
|
32 </defs>
|
|
|
33 <sodipodi:namedview
|
|
|
34 id="base"
|
|
|
35 pagecolor="#ffffff"
|
|
|
36 bordercolor="#666666"
|
|
|
37 borderopacity="1.0"
|
|
|
38 gridtolerance="10000"
|
|
|
39 guidetolerance="10"
|
|
|
40 objecttolerance="10"
|
|
|
41 inkscape:pageopacity="0.0"
|
|
|
42 inkscape:pageshadow="2"
|
|
|
43 inkscape:zoom="1.4"
|
|
|
44 inkscape:cx="164.78349"
|
|
|
45 inkscape:cy="590.07679"
|
|
|
46 inkscape:document-units="px"
|
|
|
47 inkscape:current-layer="layer1"
|
|
|
48 inkscape:window-width="906"
|
|
|
49 inkscape:window-height="620"
|
|
|
50 inkscape:window-x="5"
|
|
|
51 inkscape:window-y="49" />
|
|
|
52 <metadata
|
|
|
53 id="metadata7">
|
|
|
54 <rdf:RDF>
|
|
|
55 <cc:Work
|
|
|
56 rdf:about="">
|
|
|
57 <dc:format>image/svg+xml</dc:format>
|
|
|
58 <dc:type
|
|
|
59 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
|
|
60 </cc:Work>
|
|
|
61 </rdf:RDF>
|
|
|
62 </metadata>
|
|
|
63 <g
|
|
|
64 inkscape:label="Layer 1"
|
|
|
65 inkscape:groupmode="layer"
|
|
|
66 id="layer1">
|
|
|
67 <g
|
|
|
68 id="g1988"
|
|
|
69 transform="translate(84.85711,0)">
|
|
|
70 <g
|
|
|
71 id="g1876">
|
|
|
72 <path
|
|
|
73 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
74 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 "
|
|
|
75 id="path1872"
|
|
|
76 sodipodi:nodetypes="cccccc" />
|
|
|
77 <path
|
|
|
78 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
79 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
|
|
|
80 id="path1874"
|
|
|
81 sodipodi:nodetypes="cccc" />
|
|
|
82 </g>
|
|
|
83 <flowRoot
|
|
|
84 style="font-size:8px;font-family:Times New Roman"
|
|
|
85 id="flowRoot1898"
|
|
|
86 xml:space="preserve"><flowRegion
|
|
|
87 id="flowRegion1900"><rect
|
|
|
88 style="font-size:8px;font-family:Times New Roman"
|
|
|
89 y="464.50504"
|
|
|
90 x="122.85714"
|
|
|
91 height="93.571426"
|
|
|
92 width="76.428574"
|
|
|
93 id="rect1902" /></flowRegion><flowPara
|
|
|
94 id="flowPara1904">Greetings!</flowPara><flowPara
|
|
|
95 id="flowPara1906" /><flowPara
|
|
|
96 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>
|
|
|
97 <g
|
|
|
98 id="g1966"
|
|
|
99 transform="translate(82,0.35715)">
|
|
|
100 <g
|
|
|
101 transform="translate(-77.85718,-140.0714)"
|
|
|
102 id="g1910">
|
|
|
103 <path
|
|
|
104 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
105 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 "
|
|
|
106 id="path1912"
|
|
|
107 sodipodi:nodetypes="cccccc" />
|
|
|
108 <path
|
|
|
109 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
110 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
|
|
|
111 id="path1914"
|
|
|
112 sodipodi:nodetypes="cccc" />
|
|
|
113 </g>
|
|
|
114 <flowRoot
|
|
|
115 transform="translate(-77.85718,-140.0714)"
|
|
|
116 style="font-size:8px;font-family:Times New Roman"
|
|
|
117 id="flowRoot1916"
|
|
|
118 xml:space="preserve"><flowRegion
|
|
|
119 id="flowRegion1918"><rect
|
|
|
120 style="font-size:8px;font-family:Times New Roman"
|
|
|
121 y="464.50504"
|
|
|
122 x="122.85714"
|
|
|
123 height="93.571426"
|
|
|
124 width="76.428574"
|
|
|
125 id="rect1920" /></flowRegion><flowPara
|
|
|
126 id="flowPara1922">Greetings!</flowPara><flowPara
|
|
|
127 id="flowPara1924" /><flowPara
|
|
|
128 id="flowPara1926">I am <flowSpan
|
|
|
129 style="font-style:italic;fill:red"
|
|
|
130 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>
|
|
|
131 <g
|
|
|
132 id="g1977"
|
|
|
133 transform="translate(81.99999,-0.35715)">
|
|
|
134 <g
|
|
|
135 transform="translate(83.57141,-139.3571)"
|
|
|
136 id="g1932">
|
|
|
137 <path
|
|
|
138 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
139 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 "
|
|
|
140 id="path1934"
|
|
|
141 sodipodi:nodetypes="cccccc" />
|
|
|
142 <path
|
|
|
143 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
|
|
144 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
|
|
|
145 id="path1936"
|
|
|
146 sodipodi:nodetypes="cccc" />
|
|
|
147 </g>
|
|
|
148 <flowRoot
|
|
|
149 transform="translate(83.57141,-139.3571)"
|
|
|
150 style="font-size:8px;font-family:Times New Roman"
|
|
|
151 id="flowRoot1938"
|
|
|
152 xml:space="preserve"><flowRegion
|
|
|
153 id="flowRegion1940"><rect
|
|
|
154 style="font-size:8px;font-family:Times New Roman"
|
|
|
155 y="464.50504"
|
|
|
156 x="122.85714"
|
|
|
157 height="93.571426"
|
|
|
158 width="76.428574"
|
|
|
159 id="rect1942" /></flowRegion><flowPara
|
|
|
160 id="flowPara1944">Greetings!</flowPara><flowPara
|
|
|
161 id="flowPara1946" /><flowPara
|
|
|
162 id="flowPara1948">I am <flowSpan
|
|
|
163 style="font-style:italic;fill:red"
|
|
|
164 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>
|
|
|
165 <path
|
|
|
166 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"
|
|
|
167 d="M 215.502,457.71933 L 196.35507,424.5765"
|
|
|
168 id="path1999"
|
|
|
169 inkscape:connector-type="polyline"
|
|
|
170 inkscape:connection-start="#g1988"
|
|
|
171 inkscape:connection-end="#g1966" />
|
|
|
172 <path
|
|
|
173 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"
|
|
|
174 d="M 277.06936,457.71933 L 296.21629,424.5765"
|
|
|
175 id="path2001"
|
|
|
176 inkscape:connector-type="polyline"
|
|
|
177 inkscape:connection-start="#g1988"
|
|
|
178 inkscape:connection-end="#g1977" />
|
|
|
179 <text
|
|
|
180 xml:space="preserve"
|
|
|
181 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"
|
|
|
182 x="302.42859"
|
|
|
183 y="515.08905"
|
|
|
184 id="text1905"><tspan
|
|
|
185 sodipodi:role="line"
|
|
|
186 id="tspan1907"
|
|
|
187 x="302.42859"
|
|
|
188 y="515.08905">Base version</tspan></text>
|
|
|
189 <text
|
|
|
190 xml:space="preserve"
|
|
|
191 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"
|
|
|
192 x="45.57143"
|
|
|
193 y="374.1619"
|
|
|
194 id="text1917"><tspan
|
|
|
195 sodipodi:role="line"
|
|
|
196 id="tspan1919"
|
|
|
197 x="45.57143"
|
|
|
198 y="374.1619">Our changes</tspan></text>
|
|
|
199 <text
|
|
|
200 xml:space="preserve"
|
|
|
201 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"
|
|
|
202 x="385.71429"
|
|
|
203 y="374.1619"
|
|
|
204 id="text1921"><tspan
|
|
|
205 sodipodi:role="line"
|
|
|
206 id="tspan1923"
|
|
|
207 x="385.71429"
|
|
|
208 y="374.1619">Their changes</tspan></text>
|
|
|
209 </g>
|
|
|
210 </svg>
|
