Update addon.py

ynput · Oct 29, 2024 · 87ef0d5 · 87ef0d5
1 parent bd7ed98
commit 87ef0d5
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/client/ayon_kitsu/addon.py b/client/ayon_kitsu/addon.py
@@ -96,20 +96,15 @@ def get_plugin_paths(self):
 
         return {
             "publish": self.get_publish_plugin_paths(),
-            #"hooks": self.get_launch_hook_paths(),
+            "hooks": self.get_launch_hook_paths(),
             # The laucher action is not working since AYON conversion
             # "actions": [os.path.join(KITSU_ROOT, "plugins", "launcher")],
         }
 
     def get_publish_plugin_paths(self, host_name=None):
         return [os.path.join(KITSU_ROOT, "plugins", "publish")]
-<<<<<<< HEAD
     def get_launch_hook_paths(self, host_name=None):
         return [os.path.join(KITSU_ROOT, "hooks")]
-=======
-    #def get_launch_hook_paths(self, host_name=None):
-        #return [os.path.join(KITSU_ROOT, "hooks")]
->>>>>>> d887d10b4d525b36a7ed45da66e15005f89c4d76
 
 def is_kitsu_enabled_in_settings(project_settings):
     """Check if kitsu is enabled in kitsu project settings.