Fix merge conflict

jldbc · Jun 19, 2024 · 2cb6f5d · 2cb6f5d
1 parent 4933975
commit 2cb6f5d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pybaseball/retrosheet.py b/pybaseball/retrosheet.py
@@ -100,12 +100,8 @@
     'player_id', 'last_name', 'first_name', 'bats', 'throws', 'team', 'position'
 ]
 
-<<<<<<< HEAD
-gamelog_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/seasons/{}/GL{}.TXT'
-=======
 gamelog_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/gamelog/GL{}.TXT'
 season_gamelog_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/seasons/{}/GL{}.TXT'
->>>>>>> upstream/master
 schedule_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/seasons/{}/{}schedule.csv'
 parkid_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/reference/ballparks.csv'
 roster_url = 'https://raw.githubusercontent.com/chadwickbureau/retrosheet/master/seasons/{}/{}{}.ROS'