[Orxonox-commit 1931] r6648 - code/branches/ppspickups1

[ebeier at orxonox.net]

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

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


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