From 88ebb735528a3f1b9b6a17c01d96e36d37e9ea8a Mon Sep 17 00:00:00 2001
From: Joe <jskier12@gmail.com>
Date: Mon, 3 Aug 2020 22:21:17 -0600
Subject: [PATCH] clean up merge conflicts

---
 package-lock.json  | 20 --------------------
 server/uno_test.go | 30 ------------------------------
 2 files changed, 50 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a331c9a1..48e341a09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,23 +1,3 @@
 {
-<<<<<<< HEAD
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "bezier-easing": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/bezier-easing/-/bezier-easing-2.1.0.tgz",
-      "integrity": "sha1-wE3+i5JtbsrKGBPWn/F5t8ICXYY="
-    },
-    "vue-scrollto": {
-      "version": "2.18.1",
-      "resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.18.1.tgz",
-      "integrity": "sha512-JojeVOP1Z50Jt0OCOd61jRRRF8TrNvPAzF4LAKwkTEZnt30mpDd48aDZZOEPD3l6z2PybOyUGFT/FNWfTtFv9w==",
-      "requires": {
-        "bezier-easing": "2.1.0"
-      }
-    }
-  }
-=======
   "lockfileVersion": 1
->>>>>>> dev
 }
diff --git a/server/uno_test.go b/server/uno_test.go
index 2c9086bc0..828fbef17 100644
--- a/server/uno_test.go
+++ b/server/uno_test.go
@@ -23,35 +23,6 @@ func setupGameWithPlayer(database *db.DB) (*model.Game, *model.Player) {
 	return game, player
 }
 
-<<<<<<< HEAD
-func TestContains(t *testing.T) {
-	// setup test data
-	var data []string = []string{}
-	data = append(data, "Test")
-
-	// check to see if "Test" is found in the correct index
-	index, found := contains(data, "Test")
-	assert.Equal(t, index, 0)
-	assert.Equal(t, found, true)
-
-	// make sure a missing string is not found at any index
-	index, found = contains(data, "Invalid entry")
-	assert.Equal(t, index, -1)
-	assert.Equal(t, found, false)
-}
-
-func TestCheckForWinner(t *testing.T) {
-	players = []string{"player1", "player2"}
-	allCards = make(map[string][]model.Card)
-	assert.Equal(t, "player1", checkForWinner())
-	dealCards()
-	assert.Equal(t, "", checkForWinner())
-	allCards[players[0]] = make([]model.Card, 0)
-	assert.Equal(t, "player1", checkForWinner())
-	allCards[players[0]] = make([]model.Card, 5)
-	allCards[players[1]] = make([]model.Card, 0)
-	assert.Equal(t, "player2", checkForWinner())
-=======
 func TestDrawCard(t *testing.T) {
 
 	// Test passing in a bogus game id, we should get an error
@@ -200,7 +171,6 @@ func TestDealCards(t *testing.T) {
 	assert.Equal(t, 180, len(game.DrawPile))
 	assert.Equal(t, 1, len(game.DiscardPile))
 
->>>>>>> dev
 }
 
 func TestCheckForCardInHand(t *testing.T){