Fix commit conflict.

feeley · May 31, 2012 · ab65bb4 · ab65bb4
1 parent e89021f
commit ab65bb4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/include/stamp.h b/include/stamp.h
@@ -3,4 +3,4 @@
  */
 
 #define ___STAMP_YMD 20120531
-#define ___STAMP_HMS 193859
+#define ___STAMP_HMS 194414