Mercurial > hg > soundsoftware-site
diff app/views/my/.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/my/.svn/all-wcprops Thu Jul 14 10:46:20 2011 +0100 +++ b/app/views/my/.svn/all-wcprops Thu Jul 14 10:50:53 2011 +0100 @@ -1,41 +1,5 @@ -K 25 -svn:wc:ra_dav:version-url -V 37 -/svn/!svn/ver/4380/trunk/app/views/my -END -account.rhtml K 25 svn:wc:ra_dav:version-url V 51 -/svn/!svn/ver/4223/trunk/app/views/my/account.rhtml +/svn/!svn/ver/5878/branches/1.2-stable/app/views/my END -page.rhtml -K 25 -svn:wc:ra_dav:version-url -V 48 -/svn/!svn/ver/3542/trunk/app/views/my/page.rhtml -END -password.rhtml -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/2678/trunk/app/views/my/password.rhtml -END -_sidebar.rhtml -K 25 -svn:wc:ra_dav:version-url -V 52 -/svn/!svn/ver/3775/trunk/app/views/my/_sidebar.rhtml -END -_block.rhtml -K 25 -svn:wc:ra_dav:version-url -V 50 -/svn/!svn/ver/2528/trunk/app/views/my/_block.rhtml -END -page_layout.rhtml -K 25 -svn:wc:ra_dav:version-url -V 55 -/svn/!svn/ver/4380/trunk/app/views/my/page_layout.rhtml -END