From 2209d1b99245e2db3bfe899fc859727f3eac92e7 Mon Sep 17 00:00:00 2001 From: David Allemang Date: Thu, 30 Apr 2020 20:31:01 -0400 Subject: [PATCH] missed a piece in the merge --- lib/screens/sport.dart | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/screens/sport.dart b/lib/screens/sport.dart index 105b261..25a15e3 100644 --- a/lib/screens/sport.dart +++ b/lib/screens/sport.dart @@ -7,15 +7,9 @@ class Sport extends StatelessWidget { const Item("Basketball", Colors.red,[5,13]), const Item("Soccer", Colors.pinkAccent,[9,17]), const Item('Baseball', Colors.orange,[1]), -<<<<<<< HEAD const Item('Softball', Colors.yellow,[12]), const Item('Volleyball', Colors.blue,[20]), const Item('Tennis', Colors.yellowAccent,[10,18]), -======= - const Item('Volleyball', Colors.blue,[0]), - const Item('Softball', Colors.yellow,[0]), - const Item('Tennis', Colors.yellowAccent,[0,0]), ->>>>>>> filter-sport-articles ]; final feed = Feed(); // was var not final