merge

Common/config/default.json

@@ -182,57 +182,6 @@
 		"server": {
 			"port": 8080,
 			"mode": "development"
-<<<<<<< HEAD
 		}
-=======
-		},
-		"dictionaries": [
-			{"name": "bg_BG", "id": 1026},
-			{"name": "ca_ES", "id": 1027},
-			{"name": "cs_CZ", "id": 1029},
-			{"name": "da_DK", "id": 1030},
-			{"name": "de_DE", "id": 1031},
-			{"name": "el_GR", "id": 1032},
-			{"name": "en_US", "id": 1033},
-			{"name": "fr_FR", "id": 1036},
-			{"name": "hu_HU", "id": 1038},
-			{"name": "it_IT", "id": 1040},
-			{"name": "ko_KR", "id": 1042},
-			{"name": "nl_NL", "id": 1043},
-			{"name": "nb_NO", "id": 1044},
-			{"name": "pl_PL", "id": 1045},
-			{"name": "pt_BR", "id": 1046},
-			{"name": "ro_RO", "id": 1048},
-			{"name": "ru_RU", "id": 1049},
-			{"name": "hr_HR", "id": 1050},
-			{"name": "sk_SK", "id": 1051},
-			{"name": "sv_SE", "id": 1053},
-			{"name": "tr_TR", "id": 1055},
-			{"name": "id_ID", "id": 1057},
-			{"name": "uk_UA", "id": 1058},
-			{"name": "sl_SI", "id": 1060},
-			{"name": "lv_LV", "id": 1062},
-			{"name": "lt_LT", "id": 1063},
-			{"name": "vi_VN", "id": 1066},
-			{"name": "az_Latn_AZ", "id": 1068},
-			{"name": "eu_ES", "id": 1069},
-			{"name": "kk_KZ", "id": 1087},
-			{"name": "mn_MN", "id": 1104},
-			{"name": "gl_ES", "id": 1110},
-			{"name": "lb_LU", "id": 1134},
-			{"name": "ca_ES_valencia", "id": 2051},
-			{"name": "de_CH", "id": 2055},
-			{"name": "en_GB", "id": 2057},
-			{"name": "nn_NO", "id": 2068},
-			{"name": "pt_PT", "id": 2070},
-			{"name": "de_AT", "id": 3079},
-			{"name": "en_AU", "id": 3081},
-			{"name": "es_ES", "id": 3082},
-			{"name": "en_CA", "id": 4105},
-			{"name": "en_ZA", "id": 7177},
-			{"name": "sr_Latn_RS", "id": 9242},
-			{"name": "sr_Cyrl_RS", "id": 10266}
-		]	
->>>>>>> v4.3.3
 	}
-}
+}