From 08ceaad17e0f0d646d495f8de44f1abc4cc97c14 Mon Sep 17 00:00:00 2001
From: fmareuil <fmareuil@pasteur.fr>
Date: Mon, 27 Apr 2020 09:13:05 +0200
Subject: [PATCH] cherry-pick loginfo
---
ippisite/ippisite/admin.py | 8 --------
1 file changed, 8 deletions(-)
diff --git a/ippisite/ippisite/admin.py b/ippisite/ippisite/admin.py
index b5fa4116..dd1a9292 100644
--- a/ippisite/ippisite/admin.py
+++ b/ippisite/ippisite/admin.py
@@ -38,15 +38,7 @@ class IppidbAdmin(admin.AdminSite):
self.admin_view(self.launch_plots_computing_view),
),
path("launch_test_command/", self.admin_view(self.launch_test_command),),
-<<<<<<< HEAD
-=======
- path("import_targetcentric/", self.admin_view(self.import_targetcentric),),
- path("delete_targetcentric/", self.admin_view(self.delete_targetcentric),),
- path("clean_targetcentric/", self.admin_view(self.clean_targetcentric),),
- path("update_mrc/", self.admin_view(self.update_mrc),),
- path("check_path/", self.admin_view(self.check_path),),
path("tasklog/", self.admin_view(self.tasklog), name="tasklog"),
->>>>>>> 1946cbb... log interactive info
]
return my_urls + urls
--
GitLab