Fixed #2101

src/Ombi/wwwroot/translations/da.json

@@ -21,11 +21,7 @@
     "Request": "Anmod",
     "Denied": "Afvist",
     "Approve": "Godkendt",
-<<<<<<< HEAD
     "PartlyAvailable": "Delvist tilgængelig",
-=======
-    "PartlyAvailable": "Partly Available",
->>>>>>> New translations en.json (Danish)
     "Errors": {
       "Validation": "Tjek venligst dine indtastede værdier"
     }
@@ -91,7 +87,6 @@
       "Trailer": "Trailer"
     },
     "TvShows": {
-<<<<<<< HEAD
       "Popular": "Populære",
       "Trending": "Aktuelle",
       "MostWatched": "Mest sete",
@@ -105,18 +100,6 @@
       "SubmitRequest": "Send anmodning",
       "Season": "Sæson: {{seasonNumber}}",
       "SelectAllInSeason": "Vælg alle i sæson {{seasonNumber}}"
-=======
-      "Popular": "Popular",
-      "Trending": "Trending",
-      "MostWatched": "Most Watched",
-      "MostAnticipated": "Most Anticipated",
-      "Results": "Results",
-      "AirDate": "Air Date:",
-      "AllSeasons": "All Seasons",
-      "FirstSeason": "First Season",
-      "LatestSeason": "Latest Season",
-      "Select": "Select ..."
->>>>>>> New translations en.json (Danish)
     }
   },
   "Requests": {