Skip to content

Commit e231d45

Browse files
committed
Fix merge conflict
1 parent 5fe4533 commit e231d45

File tree

1 file changed

+2
-12
lines changed

1 file changed

+2
-12
lines changed

content/languages.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,8 @@
4242
- name: perzsa
4343
translated_name: فارسی
4444
code: fa
45-
<<<<<<< HEAD
46-
status: 0
47-
- name: francia
48-
=======
4945
status: 1
50-
- name: French
51-
>>>>>>> dea4f329ea3a7bba116e07adf67eb5c8b6c528cd
46+
- name: francia
5247
translated_name: Français
5348
code: fr
5449
status: 2
@@ -71,13 +66,8 @@
7166
- name: magyar
7267
translated_name: magyar
7368
code: hu
74-
<<<<<<< HEAD
75-
status: 1
76-
- name: örmény
77-
=======
7869
status: 2
79-
- name: Armenian
80-
>>>>>>> dea4f329ea3a7bba116e07adf67eb5c8b6c528cd
70+
- name: örmény
8171
translated_name: Հայերեն
8272
code: hy
8373
status: 0

0 commit comments

Comments
 (0)