remove source control message

2019-01-08 12:11:27 +01:00
parent dfa5bfc053
commit 9299fbc517
2 changed files with 3 additions and 6 deletions
@@ -56,11 +56,8 @@ class StatusBarController: NSObject, NSMenuItemValidation {
                }
            }
            
-<<<<<<< HEAD
-            if let matches = self.matchesAPI.fetchMatches(for: "counterstrike") {
-=======
-            if let matches = self.matchesAPI.fetchMatches(for: "starcraft2") {
->>>>>>> 7de8fd2c2bd41baf8480580a6392c8c7869919a6
+
+            if let matches = self.matchesAPI.fetchMatches(for: "dota2") {
                for match in matches {
                    let newItem = MatchMenuItem.init(for: match, action: #selector(self.openStreamLink))
                    newItem.tag = 1