wprk in progress

HeatherShane · HeatherShane · commit 47ffbe48c69c · 2016-01-28T17:45:11.000-05:00
diff --git a/TeamYeah b/TeamYeah
@@ -0,0 +1 @@
+Subproject commit fb5801b3b8992a72fc8a9aedef1f27531d08cfa3
diff --git a/class_2.js b/class_2.js
diff --git a/class_3.js b/class_3.js
@@ -15,6 +15,7 @@ var playerTwo = {
   getHand: getHand
 };
 
+<<<<<<< HEAD
 var playerOneScore = 0
 var playerTwoScore = 0
 
@@ -60,4 +61,9 @@ playGame(playerOne, playerTwo, 5)
 };
 
 
+};
+=======
+function playRound() {
+  console.log(playerOne.name, playerTwo)
+
 };

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Subproject commit fb5801b3b8992a72fc8a9aedef1f27531d08cfa3`