fix languages.yml

Author: balazsorban44

content/languages.yml

@@ -66,13 +66,8 @@
 - name: magyar
   translated_name: magyar
   code: hu
-<<<<<<< HEAD
-  status: 0
-- name: örmény
-=======
   status: 1
-- name: Armenian
->>>>>>> fb382ccb13e30e0d186b88ec357bb51e91de6504
+- name: örmény
   translated_name: Հայերեն
   code: hy
   status: 0