From svnadmin@urchin.earth.li Sun Feb 28 16:38:02 2010
From: svnadmin@urchin.earth.li
To: openguides-commits@lists.openguides.org
Subject: [openguides-commits] r1286 - in website/publish: . includes
Date: Sun, 28 Feb 2010 16:38:02 +0000
Message-ID: <E1Nlm9a-0007fd-Hf@urchin.earth.li>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4306827493051475225=="

--===============4306827493051475225==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: dom
Date: 2010-02-28 16:38:02 +0000 (Sun, 28 Feb 2010)
New Revision: 1286

Modified:
   website/publish/
   website/publish/gone.shtml
   website/publish/includes/cities_list.inc
Log:
merge to publish



Property changes on: website/publish
___________________________________________________________________
Modified: svn:mergeinfo
   - /website/preview:1265-1277
   + /website/preview:1265-1277,1284-1285


Property changes on: website/publish/gone.shtml
___________________________________________________________________
Modified: svn:mergeinfo
   - /website/preview/gone.shtml:1276-1277
   + /website/preview/gone.shtml:1276-1277,1284-1285

Modified: website/publish/includes/cities_list.inc
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- website/publish/includes/cities_list.inc	2010-02-28 16:37:27 UTC (rev 128=
5)
+++ website/publish/includes/cities_list.inc	2010-02-28 16:38:02 UTC (rev 128=
6)
@@ -11,54 +11,39 @@
=20
   <tr>
     <td><a href=3D"http://cambridge.openguides.org/">Cambridge</a></td>
-    <td><a href=3D"http://norwich.openguides.org/">Norwich</a></td>
+    <td><a href=3D"http://oxford.openguides.org/">Oxford</a></td>
   </tr>
   <tr>
     <td><a href=3D"http://cotswolds.openguides.org/">Cotswolds</a></td>
-    <td><a href=3D"http://nottingham.openguides.org/">Nottingham</a></td>
-  <tr>
-    <td><a href=3D"http://london.openguides.org/">London</a></td>
-    <td><a href=3D"http://oxford.openguides.org/">Oxford</a></td>
+    <td><a href=3D"http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford=
.cgi">Vegan Oxford</a></td>
   </tr>
   <tr>
     <td><a href=3D"http://london.randomness.org.uk/">Randomness (London)</a>=
</td>
-    <td><a href=3D"http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford=
.cgi">Vegan Oxford</a></td>
+    <td><a href=3D"http://reading.openguides.org/">Reading</a></td>
   </tr>
   <tr>
     <td><a href=3D"http://miltonkeynes.openguides.org/">Milton Keynes</a></t=
d>
-    <td><a href=3D"http://reading.openguides.org/">Reading</a></td>
+    <td><a href=3D"http://southampton.openguides.org/">Southampton</a></td>
   </tr>
   <tr>
     <td><a href=3D"http://north-devon.openguides.org/">North Devon</a></td>
-    <td><a href=3D"http://southampton.openguides.org/">Southampton</a></td>
+    <td></td>
   </tr>
-  <tr>
-    <th>Canada</th>
=20
+  <tr>
     <th>Europe</th>
+    <th></th>
   </tr>
   <tr>
-    <td><a href=3D"http://victoria.openguides.org/">Victoria, BC</a></td>
     <td><a href=3D"http://www.justbiit.com/cgi-bin/openguides/">Brussels</a>=
</td>
+    <td></td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td><a href=3D"http://cern.openguides.org/">CERN</a></td>
+    <td></td>
   </tr>
-  <tr>
-    <th>USA</th>
-    <th>Worldwide</th>
-  </tr>
=20
-  <tr>
-    <td><a href=3D"http://boston.openguides.org/">Boston, MA</a></td>
-    <td><a href=3D"http://engineer.openguides.org/">Tourist Engineer</a></td>
-  </tr>
-  <tr>
-    <td><a href=3D"http://saintpaul.openguides.org/">Saint Paul, MN</a></td>
-  </tr>
-
 </table>
 </div>
=20
-<!-- end cities list -->
\ No newline at end of file
+<!-- end cities list -->



--===============4306827493051475225==--