Index: lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties,v
diff -u -r1.7.6.2.2.1 -r1.7.6.2.2.2
--- lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties	28 Aug 2009 03:41:20 -0000	1.7.6.2.2.1
+++ lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties	28 Aug 2009 03:44:51 -0000	1.7.6.2.2.2
@@ -3,6 +3,7 @@
 #locale code: JP 
 
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Aug 27 21:21:54 CST 2009 
+>>>>>>> 1.12
  
 #=================== labels for Multiple Choice Questions =================#