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

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents cbce1fd3b1b7
children
line wrap: on
line diff
--- a/app/views/common/.svn/all-wcprops	Thu Jul 14 10:46:20 2011 +0100
+++ b/app/views/common/.svn/all-wcprops	Thu Jul 14 10:50:53 2011 +0100
@@ -1,47 +1,5 @@
 K 25
 svn:wc:ra_dav:version-url
-V 41
-/svn/!svn/ver/4286/trunk/app/views/common
+V 55
+/svn/!svn/ver/5878/branches/1.2-stable/app/views/common
 END
-_file.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/3585/trunk/app/views/common/_file.rhtml
-END
-feed.atom.rxml
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/2768/trunk/app/views/common/feed.atom.rxml
-END
-error.html.erb
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/4286/trunk/app/views/common/error.html.erb
-END
-_preview.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 56
-/svn/!svn/ver/1699/trunk/app/views/common/_preview.rhtml
-END
-_diff.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/3585/trunk/app/views/common/_diff.rhtml
-END
-_calendar.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 57
-/svn/!svn/ver/3790/trunk/app/views/common/_calendar.rhtml
-END
-_tabs.rhtml
-K 25
-svn:wc:ra_dav:version-url
-V 53
-/svn/!svn/ver/3174/trunk/app/views/common/_tabs.rhtml
-END