From 04069434be15c06666a7493b1b6329a78c00d1d1 Mon Sep 17 00:00:00 2001
From: tom <tom@ground-control>
Date: Fri, 8 May 2015 08:09:32 -0500
Subject: merging

---
 src/list.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/list.cpp b/src/list.cpp
index c21dd52..b86f077 100644
--- a/src/list.cpp
+++ b/src/list.cpp
@@ -3,12 +3,8 @@
 List::List(Window m) //Constructor
 {
   int i;
-<<<<<<< HEAD
+
   for(i=0;i<10;i++)
-=======
-  //Creates 5 creatures, inserts them into vector C
-  for(i=0;i<5;i++)
->>>>>>> c63d77ddddb69ef0f641d90a8c3922fdc356224c
   {
     Creature X(m,"img/Cbasic.png");
     C.push_back(X);
-- 
cgit v1.2.3