fixing rebase failure (#185)

PlayFab · Mar 17, 2022 · 96edcb6 · 96edcb6
1 parent ae123b4
commit 96edcb6
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/cmd/nodeagent/nodeagentmanager_test.go b/cmd/nodeagent/nodeagentmanager_test.go
@@ -122,14 +122,10 @@ var _ = Describe("nodeagent tests", func() {
 			if !ok {
 				return false
 			}
-<<<<<<< HEAD
-			return tempgs.(*GameServerDetails).IsActive && tempgs.(*GameServerDetails).PreviousGameState == GameStateStandingBy
-=======
 			tempgs.(*GameServerDetails).Mutex.RLock()
 			gsd := *tempgs.(*GameServerDetails)
 			tempgs.(*GameServerDetails).Mutex.RUnlock()
-			return gsd.WasActivated && gsd.PreviousGameState == GameStateStandingBy
->>>>>>> PortRegistry V2
+			return gsd.IsActive && gsd.PreviousGameState == GameStateStandingBy
 		}).Should(BeTrue())
 
 		// heartbeat from the game is still StandingBy