[Orxonox-commit 1930] r6647 - code/branches/ppspickups1

[ebeier at orxonox.net]

Author: ebeier
Date: 2010-03-29 16:44:24 +0200 (Mon, 29 Mar 2010)
New Revision: 6647

Modified:
   code/branches/ppspickups1/svntest.txt
Log:


Modified: code/branches/ppspickups1/svntest.txt
===================================================================
--- code/branches/ppspickups1/svntest.txt	2010-03-29 14:43:20 UTC (rev 6646)
+++ code/branches/ppspickups1/svntest.txt	2010-03-29 14:44:24 UTC (rev 6647)
@@ -1 +1,3 @@
-blah balh ben balal
\ No newline at end of file
+<<<<<<< .mine
+asd=======
+blah balh ben balal>>>>>>> .r6646