--- branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h	2010/12/26 10:27:29	312
+++ branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h	2011/02/26 23:03:36	413
@@ -29,5 +29,9 @@
 //
 // TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org
 
-#define SVN_REV 271
+<<<<<<< .mine
+#define SVN_REV 400
+=======
+#define SVN_REV 394
+>>>>>>> .r412
 #define SVN_MODS 1