diff --git a/ippisite/ippisite/admin.py b/ippisite/ippisite/admin.py index b5fa4116dfa519da864b4f8f0608d07a65cb2f88..dd1a9292a8e817bcec381181cb8a0af904697662 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