Apagando fuego en travis

Metronus · Apr 24, 2017 · 08e6b51 · 08e6b51
1 parent f7087ec
commit 08e6b51
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Metronus-Project/metronus_app/test/testProjectMetrics.py b/Metronus-Project/metronus_app/test/testProjectMetrics.py
@@ -503,7 +503,6 @@ def createTaskInProjDept(project, department):
             response = c.get("/project/ajaxTimePerDpmt?project_id={0}&start_date=2016-01-01&end_date=2017-01-01" .format( project.id))
             self.assertEquals(response.status_code, 200)
             checkJsonMetricsAreEqual(self, str(response.content, encoding='utf8'), true_data)
-<<<<<<< HEAD
 
     def test_access_denied_not_logged_profit(self):
         """
@@ -553,5 +552,4 @@ def test_bad_request_profit(self):
 
         response = c.get("/project/ajaxProfit")
         self.assertEquals(response.status_code, 404)
-=======
->>>>>>> 09bc6f951af2d77b2d8651f7c1aa05a2905798d1
+
diff --git a/Metronus-Project/populate_database.py b/Metronus-Project/populate_database.py
@@ -11,7 +11,6 @@
 from metronus_app.model.goalEvolution             import GoalEvolution
 from metronus_app.model.projectDepartmentEmployeeRole import ProjectDepartmentEmployeeRole
 from django.db                                        import transaction
-from populate_database2 import randomLoad
 @transaction.atomic
 def basicLoad():
     """