Resolve merge conflicts

bragefuglseth · Jun 20, 2024 · 46e9d53 · 46e9d53
2 parents 13fc405 + 4364075
commit 46e9d53
Show file tree

Hide file tree

Showing 4 changed files with 1,276 additions and 0 deletions.
diff --git a/po/LINGUAS b/po/LINGUAS
@@ -1,5 +1,8 @@
 cs
+de
 es
+fr
 hi
+hu
 nb
 pt_BR
-Original file line number
+Diff line change
@@ -1,5 +1,8 @@
     cs
+    de
     es
+    fr
     hi
+    hu
     nb
     pt_BR