felixfoertsch/macOS-MenuBar-MatchTicker
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove source control message

Browse Source
This commit is contained in:
Felix Förtsch
2019-01-08 12:11:27 +01:00
parent dfa5bfc053
commit 9299fbc517
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LiquipediaMenu/API/LiquipediaMatchesAPI.swift
View File

@@ -2,7 +2,7 @@
// LiquipediaMatchesAPI.swift
// LiquipediaMenu
//
//This class scrapes the Liquipedia upcoming matches page. It extracts them and puts them into a [Match]? by, using the Match class as a data storage objet.
//This class scrapes the Liquipedia upcoming matches page. It extracts them and puts them into a [Match]? by, using the Match class as a data storage objet.
// Created by Felix Förtsch on 08.10.18.
// Copyright © 2018 Felix Förtsch. All rights reserved.
//

7
LiquipediaMenu/StatusBarController.swift
View File

@@ -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