Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7ea7cfd9473193e80d9303bee75ae82ff0c7be4c -rf27fea8eb6533208beffced8d55e3544857577e8
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7ea7cfd9473193e80d9303bee75ae82ff0c7be4c)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f27fea8eb6533208beffced8d55e3544857577e8)
@@ -2,7 +2,7 @@
 #language code: en 
 #locale code: AU 
 
- # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 07:16:04 CST 2019 
+ # Exported from the LAMS Community by Ernie Ghiglione on Mon Dec 09 05:47:31 CST 2019 
  
 #=================== labels for Learner (Java) =================# 
 
@@ -192,7 +192,13 @@
 button.kumalive.poll.chart.switch  =Switch chart
 outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
 label.learners  ={0} learners
+<<<<<<< HEAD
 outcome.authoring.create.new  =[create new]
 
 
 #======= End labels: Exported 187 labels for en AU =====
+=======
+
+
+#======= End labels: Exported 186 labels for en AU =====
+>>>>>>> develop