diff test/fixtures/ldap/.svn/entries @ 514:7eba09d624db live

Merge
author Chris Cannam
date Thu, 14 Jul 2011 10:50:53 +0100
parents 851510f1b535
children
line wrap: on
line diff
--- a/test/fixtures/ldap/.svn/entries	Thu Jul 14 10:46:20 2011 +0100
+++ b/test/fixtures/ldap/.svn/entries	Thu Jul 14 10:50:53 2011 +0100
@@ -1,8 +1,8 @@
 10
 
 dir
-4411
-http://redmine.rubyforge.org/svn/trunk/test/fixtures/ldap
+6270
+http://redmine.rubyforge.org/svn/branches/1.2-stable/test/fixtures/ldap
 http://redmine.rubyforge.org/svn
 
 
@@ -32,7 +32,7 @@
 
 
 
-2010-09-23T14:37:45.327799Z
+2011-07-14T09:24:10.000000Z
 acbef41cb6cf252c83489cc3344e2604
 2010-02-26T08:31:36.418866Z
 3489
@@ -66,7 +66,7 @@
 
 
 
-2010-09-23T14:37:45.327799Z
+2011-07-14T09:24:10.000000Z
 f1b10e6d96dd658e563d4ba74d52e87b
 2010-02-26T08:31:36.418866Z
 3489