Correct error merge

Sources/bowlin_project/lib/model/GameDetail.dart

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

Sources/bowlin_project/lib/model/StubManager/UserManager.dart

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

Sources/bowlin_project/test/model_test.dart

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