hgbook
view es/tour-merge-conflict.svg @ 890:2887b61fa4fe
Change fields to fieldsets in the Comment admin model. The 'date'
field isn't working properly for an unknown reason, so it has been
removed from the interface temporarily.
field isn't working properly for an unknown reason, so it has been
removed from the interface temporarily.
| author | dukebody <dukebody@gmail.com> |
|---|---|
| date | Sun Oct 11 21:12:46 2009 +0200 (2009-10-11) |
| parents | |
| children |
line source
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://creativecommons.org/ns#"
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.46"
16 sodipodi:docname="tour-merge-conflict.svg"
17 inkscape:output_extension="org.inkscape.output.svg.inkscape">
18 <defs
19 id="defs4">
20 <inkscape:perspective
21 sodipodi:type="inkscape:persp3d"
22 inkscape:vp_x="0 : 526.18109 : 1"
23 inkscape:vp_y="0 : 1000 : 0"
24 inkscape:vp_z="744.09448 : 526.18109 : 1"
25 inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
26 id="perspective2861" />
27 <marker
28 inkscape:stockid="Arrow1Mend"
29 orient="auto"
30 refY="0.0"
31 refX="0.0"
32 id="Arrow1Mend"
33 style="overflow:visible;">
34 <path
35 id="path3053"
36 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 "
37 style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
38 transform="scale(0.4) rotate(180) translate(10,0)" />
39 </marker>
40 </defs>
41 <sodipodi:namedview
42 id="base"
43 pagecolor="#ffffff"
44 bordercolor="#666666"
45 borderopacity="1.0"
46 gridtolerance="10000"
47 guidetolerance="10"
48 objecttolerance="10"
49 inkscape:pageopacity="0.0"
50 inkscape:pageshadow="2"
51 inkscape:zoom="1.4"
52 inkscape:cx="251.65243"
53 inkscape:cy="733.42197"
54 inkscape:document-units="px"
55 inkscape:current-layer="layer1"
56 inkscape:window-width="906"
57 inkscape:window-height="659"
58 inkscape:window-x="5"
59 inkscape:window-y="49"
60 showgrid="false" />
61 <metadata
62 id="metadata7">
63 <rdf:RDF>
64 <cc:Work
65 rdf:about="">
66 <dc:format>image/svg+xml</dc:format>
67 <dc:type
68 rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
69 </cc:Work>
70 </rdf:RDF>
71 </metadata>
72 <g
73 inkscape:label="Layer 1"
74 inkscape:groupmode="layer"
75 id="layer1">
76 <g
77 id="g1988"
78 transform="translate(84.85711,0)">
79 <g
80 id="g1876">
81 <path
82 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
83 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 "
84 id="path1872"
85 sodipodi:nodetypes="cccccc" />
86 <path
87 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
88 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
89 id="path1874"
90 sodipodi:nodetypes="cccc" />
91 </g>
92 <flowRoot
93 style="font-size:8px;font-family:Times New Roman"
94 id="flowRoot1898"
95 xml:space="preserve"><flowRegion
96 id="flowRegion1900"><rect
97 style="font-size:8px;font-family:Times New Roman"
98 y="464.50504"
99 x="122.85714"
100 height="93.571426"
101 width="76.428574"
102 id="rect1902" /></flowRegion><flowPara
103 id="flowPara1904">Saludos!</flowPara><flowPara
104 id="flowPara1906" /><flowPara
105 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>
106 <g
107 id="g1966"
108 transform="translate(82,0.35715)">
109 <g
110 transform="translate(-77.85718,-140.0714)"
111 id="g1910">
112 <path
113 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
114 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 "
115 id="path1912"
116 sodipodi:nodetypes="cccccc" />
117 <path
118 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
119 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
120 id="path1914"
121 sodipodi:nodetypes="cccc" />
122 </g>
123 <flowRoot
124 transform="translate(-77.85718,-140.0714)"
125 style="font-size:8px;font-family:Times New Roman"
126 id="flowRoot1916"
127 xml:space="preserve"><flowRegion
128 id="flowRegion1918"><rect
129 style="font-size:8px;font-family:Times New Roman"
130 y="464.50504"
131 x="122.85714"
132 height="93.571426"
133 width="76.428574"
134 id="rect1920" /></flowRegion><flowPara
135 id="flowPara1922">Saludos!</flowPara><flowPara
136 id="flowPara1924" /><flowPara
137 id="flowPara1926">Soy <flowSpan
138 style="font-style:italic;fill:#ff0000"
139 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>
140 <g
141 id="g1977"
142 transform="translate(81.99999,-0.35715)">
143 <g
144 transform="translate(83.57141,-139.3571)"
145 id="g1932">
146 <path
147 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
148 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 "
149 id="path1934"
150 sodipodi:nodetypes="cccccc" />
151 <path
152 style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
153 d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242"
154 id="path1936"
155 sodipodi:nodetypes="cccc" />
156 </g>
157 <flowRoot
158 transform="translate(83.57141,-139.3571)"
159 style="font-size:8px;font-family:Times New Roman"
160 id="flowRoot1938"
161 xml:space="preserve"><flowRegion
162 id="flowRegion1940"><rect
163 style="font-size:8px;font-family:Times New Roman"
164 y="464.50504"
165 x="122.85714"
166 height="93.571426"
167 width="76.428574"
168 id="rect1942" /></flowRegion><flowPara
169 id="flowPara1944">Saludos!</flowPara><flowPara
170 id="flowPara1946" /><flowPara
171 id="flowPara1948">Soy <flowSpan
172 style="font-style:italic;fill:#ff0000"
173 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>
174 <path
175 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"
176 d="M 215.502,457.71933 L 196.35507,424.5765"
177 id="path1999"
178 inkscape:connector-type="polyline"
179 inkscape:connection-start="#g1988"
180 inkscape:connection-end="#g1966" />
181 <path
182 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"
183 d="M 277.06936,457.71933 L 296.21629,424.5765"
184 id="path2001"
185 inkscape:connector-type="polyline"
186 inkscape:connection-start="#g1988"
187 inkscape:connection-end="#g1977" />
188 <text
189 xml:space="preserve"
190 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"
191 x="302.42859"
192 y="515.08905"
193 id="text1905"><tspan
194 sodipodi:role="line"
195 id="tspan1907"
196 x="302.42859"
197 y="515.08905">Versión inicial</tspan></text>
198 <text
199 xml:space="preserve"
200 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"
201 x="30.57143"
202 y="374.1619"
203 id="text1917"><tspan
204 sodipodi:role="line"
205 id="tspan1919"
206 x="30.57143"
207 y="374.1619">Nuestros cambios</tspan></text>
208 <text
209 xml:space="preserve"
210 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"
211 x="385.71429"
212 y="374.1619"
213 id="text1921"><tspan
214 sodipodi:role="line"
215 id="tspan1923"
216 x="385.71429"
217 y="374.1619">Sus cambios</tspan></text>
218 </g>
219 </svg>