aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md6
1 files changed, 0 insertions, 6 deletions
diff --git a/README.md b/README.md
index 54a18a2b..ab2075b2 100644
--- a/README.md
+++ b/README.md
@@ -217,14 +217,8 @@ $ ./linuxdeployqt-continuous-x86_64.AppImage ../release/gpgfrontend/usr/share/ap
## Languages Support
-<<<<<<< HEAD
The supported languages are listed here. Some languages use machine translation and have not been verified. If you want
to join translation and verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
-=======
-The supported languages are listed here. Some translations use machine translation and have not been verified. If you want
-to join translation or verification work, please refer to [HERE](https://gpgfrontend.pub/#/translate-interface).
-
-> > > > > > > main
### Supported Languages