diff app/views/timelog/.svn/all-wcprops @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 753f1380d6bc
children
line wrap: on
line diff
--- a/app/views/timelog/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/views/timelog/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,29 +1,5 @@
 K 25
 svn:wc:ra_dav:version-url
-V 42
-/svn/!svn/ver/4250/trunk/app/views/timelog
+V 56
+/svn/!svn/ver/5946/branches/1.2-stable/app/views/timelog
 END
-_list.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 54
-/svn/!svn/ver/4250/trunk/app/views/timelog/_list.rhtml
-END
-index.html.erb
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/4239/trunk/app/views/timelog/index.html.erb
-END
-edit.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/4248/trunk/app/views/timelog/edit.rhtml
-END
-_date_range.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 60
-/svn/!svn/ver/4235/trunk/app/views/timelog/_date_range.rhtml
-END