Browse Source

Update de.ini

causefx 9 years ago
parent
commit
9f74321d35
1 changed files with 0 additions and 3 deletions
  1. 0 3
      lang/de.ini

+ 0 - 3
lang/de.ini

@@ -135,8 +135,5 @@ CLOSE = "Schließen"
 NO_ENTRIES = "Keine anzuzeigenden Einträge"
 FILTERED = "(gefiltert aus|Gesamteinträgen)"
 NO_MATCHING = "Keine passenden Einträge gefunden"
-<<<<<<< HEAD
 TAB_NOT_LOADING = "Tab not loading?"
 TAB_NOT_LOADING_ABOUT = "Some websites block their website from displaying inside an iFrame.  To circumvent this, we can install a plugin to ignore the headers sent by these webpages thus allowing us to load the website.  Here is the download for your browser:"
-=======
->>>>>>> origin/develop