me-uncc/ITCS-4155
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

missed a piece in the merge

Browse Source
This commit is contained in:
David Allemang
2020-04-30 20:31:01 -04:00
parent dd0456299c
commit 2209d1b992
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/screens/sport.dart
View File

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