<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -24,6 +24,7 @@ template: |
   &lt;li&gt; ::ARCHIVES:: &lt;/li&gt;
   &lt;li&gt; ::SMIL::: &lt;/li&gt;
   &lt;li&gt; ::MAP:: &lt;/li&gt;
+  &lt;li&gt; &lt;a href=&quot;/ccm/Home/About/scott-services&quot;&gt;Services&lt;/a&gt;: various &lt;/li&gt;
   &lt;/ul&gt;
   &lt;/li&gt;
   &lt;li&gt; ::BRONFMAN:: &lt;/li&gt;
@@ -81,7 +82,7 @@ scott:
   url: /ccm/Home/About/scottlibrary.htm
 
 scott_study_space:
-  name: Scott study space
+  name: Study space
   title: Study space on the first floor of Scott is available 24/5 Sunday to Thursday.
   id: ji2t4bfef09mpufs7pj07cmuk4
   url: /ccm/FacilitiesAndEquipment/LateNightStudy</diff>
      <filename>branchhours.yml</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>5b4594b4249c82481d048f82707a2d960e5cb908</id>
    </parent>
    <parent>
      <id>7e4795114521616c2ecec16e01f29059e72c6821</id>
    </parent>
  </parents>
  <author>
    <name>William Denton</name>
    <email>wtd@pobox.com</email>
  </author>
  <url>http://github.com/wdenton/branchhours/commit/f7f349dbdb1255d0c0d7ad62125b15b4e3234302</url>
  <id>f7f349dbdb1255d0c0d7ad62125b15b4e3234302</id>
  <committed-date>2009-09-30T19:12:38-07:00</committed-date>
  <authored-date>2009-09-30T19:12:38-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:wdenton/branchhours

Conflicts:
	branchhours.yml</message>
  <tree>2c77667b494572422b382e9dfa10d9cf59ec6274</tree>
  <committer>
    <name>William Denton</name>
    <email>wtd@pobox.com</email>
  </committer>
</commit>
