merge conflict resolve

2026-10-17 20:21:18 +00:00 · 2023-02-28 09:52:49 +05:45
parent 2f045be8a4 d948923d95
commit d537bd2f58
81 changed files with 4301 additions and 6601 deletions
@@ -153,6 +153,15 @@ const INTEGRATION_OPTIONS = [
        clientId: '',
        docsLink: ''
    },
+    {
+        name: 'Travis CI',
+        slug: 'travisci',
+        image: 'Travis CI.png',
+        isAvailable: true,
+        type: 'pat',
+        clientId: '',
+        docsLink: ''
+    },
    {
        name: 'Azure Key Vault',
        slug: 'azure-key-vault',
@@ -171,15 +180,6 @@ const INTEGRATION_OPTIONS = [
        type: '',
        clientId: '',
        docsLink: ''
-    },
-    {
-        name: 'Travis CI',
-        slug: 'travisci',
-        image: 'Travis CI.png',
-        isAvailable: true,
-        type: 'pat',
-        clientId: '',
-        docsLink: ''
    }
 ]