Correct error merge
continuous-integration/drone/push Build is failing Details

ApiManager
Emre KARTAL 2 years ago
parent 981b3cc8eb
commit ee15c1c682

@ -61,15 +61,9 @@ class GameDetail {
_currentRound = value; _currentRound = value;
} }
<<<<<<< HEAD
Uuid get host => _host;
set host(Uuid value) {
=======
int get host => _host; int get host => _host;
set host(int value) { set host(int value) {
>>>>>>> origin/stubdata
_host = value; _host = value;
} }

@ -1,10 +1,9 @@
library StubLib; library StubLib;
import 'package:bowl_in/model/User.dart';
import '../IUserManager.dart'; import '../IUserManager.dart';
import '../IAuthManager.dart'; import '../IAuthManager.dart';
import '../Player.dart'; import '../Player.dart';
import '../User.dart';
import 'AuthManager.dart'; import 'AuthManager.dart';
import 'StubData.dart'; import 'StubData.dart';
import '../Player.dart'; import '../Player.dart';

@ -213,11 +213,7 @@ void main() {
ranksPlayers.forEach((id, rank) { ranksPlayers.forEach((id, rank) {
displayPlayer(mgr.userMgr.getUserById(id),2); displayPlayer(mgr.userMgr.getUserById(id),2);
print('\t\tRank $rank'); print('\t\tRank $rank');
}); });
print("StubManager:");
}
} }
void displayGameDetail(GameDetail gd, int numTabs) void displayGameDetail(GameDetail gd, int numTabs)

Loading…
Cancel
Save