User: hanenkamp Branch: DRUPAL-5 Date: Tue, 19 Feb 2008 21:15:36 +0000 Modified files: /modules/restapi restapi.module restapi_user.module Log message: Issue #192789, removing CVS conflict markers from committed versions. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/restapi/restapi.mo... http://cvs.drupal.org/diff.php?path=contributions/modules/restapi/restapi_us...