User: agill Branch: DRUPAL-6--3 Date: Mon, 05 Apr 2010 21:13:20 +0000 Modified files: /modules/agreservations/agres_bookings agres_bookings.module /modules/agreservations/agres_onlineform agres_onlineform.module /modules/agreservations/agres_restaurant_onlineform agres_restaurant_onlineform.module /modules/agreservations agreservations-calendar-week-2.tpl.php agreservations.info agreservations.install agreservations.module agreservations.views.inc /modules/agreservations/includes agreservations.ccknodedef.inc Log message: switching to Resource Conflict the new 6.3 branch Links: http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/agr... http://cvs.drupal.org/diff.php?path=contributions/modules/agreservations/inc...