diff app/views/users/.svn/all-wcprops @ 129:5e974759e8b2 cannam

Merge from the default branch
author Chris Cannam
date Wed, 19 Jan 2011 15:15:02 +0000
parents cd2282d2aa55 07fa8a8b56a8
children eeebe205a056
line wrap: on
line diff
--- a/app/views/users/.svn/all-wcprops	Wed Jan 19 13:27:01 2011 +0000
+++ b/app/views/users/.svn/all-wcprops	Wed Jan 19 15:15:02 2011 +0000
@@ -1,7 +1,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 40
-/svn/!svn/ver/4508/trunk/app/views/users
+/svn/!svn/ver/4729/trunk/app/views/users
 END
 _general.rhtml
 K 25
@@ -55,7 +55,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 51
-/svn/!svn/ver/4231/trunk/app/views/users/edit.rhtml
+/svn/!svn/ver/4729/trunk/app/views/users/edit.rhtml
 END
 _preferences.html.erb
 K 25
@@ -67,7 +67,7 @@
 K 25
 svn:wc:ra_dav:version-url
 V 52
-/svn/!svn/ver/4231/trunk/app/views/users/index.rhtml
+/svn/!svn/ver/4729/trunk/app/views/users/index.rhtml
 END
 show.api.rsb
 K 25