Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.31.4.3 -r1.31.4.4
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	19 May 2009 09:07:36 -0000	1.31.4.3
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	30 Jun 2009 03:13:25 -0000	1.31.4.4
@@ -2,11 +2,7 @@
 #language code: en 
 #locale code: AU 
 
-<<<<<<< ApplicationResources.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
-=======
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
->>>>>>> 1.33
  
 #=================== labels for Forum =================# 
 
Index: lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.28.4.3 -r1.28.4.4
--- lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	19 May 2009 09:07:36 -0000	1.28.4.3
+++ lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties	30 Jun 2009 03:13:25 -0000	1.28.4.4
@@ -2,11 +2,7 @@
 #language code: en 
 #locale code: AU 
 
-<<<<<<< ApplicationResources_en_AU.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
-=======
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Fri Nov 14 12:01:43 GMT 2008 
->>>>>>> 1.30
  
 #=================== labels for Forum =================# 
 
Index: lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties,v
diff -u -r1.7.6.2 -r1.7.6.3
--- lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties	16 Apr 2009 08:16:53 -0000	1.7.6.2
+++ lams_tool_forum/conf/language/lams/ApplicationResources_it_IT.properties	30 Jun 2009 03:13:25 -0000	1.7.6.3
@@ -2,11 +2,7 @@
 #language code: it 
 #locale code: IT 
 
-<<<<<<< ApplicationResources_it_IT.properties
  # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:45:03 CST 2009 
-=======
- # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Mon Apr 13 08:45:03 CST 2009 
->>>>>>> 1.8
  
 #=================== labels for Forum =================#