merge

righel · Sep 26, 2024 · f2086ca · f2086ca
1 parent c67fc34
commit f2086ca
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/automation/tags_processed.json b/automation/tags_processed.json
@@ -755,13 +755,7 @@
         "17.3.1-ce.0",
         "17.3.2-ce.0",
         "17.3.3-ce.0",
-<<<<<<< HEAD
         "17.4.0-ce.0",
-=======
-        "17.3.4-ce.0",
-        "17.4.0-ce.0",
-        "17.4.1-ce.0",
->>>>>>> 172b7cf (manual run)
         "8.0.0-ce.0",
         "8.0.1-ce.0",
         "8.0.1-ce.1",
@@ -1778,13 +1772,7 @@
         "17.3.1-ee.0",
         "17.3.2-ee.0",
         "17.3.3-ee.0",
-<<<<<<< HEAD
-        "17.4.0-ee.0",
-=======
-        "17.3.4-ee.0",
         "17.4.0-ee.0",
-        "17.4.1-ee.0",
->>>>>>> 172b7cf (manual run)
         "8.0.0-ee.0",
         "8.0.1-ee.0",
         "8.0.1-ee.1",

diff --git a/gitlab_hashes.json b/gitlab_hashes.json
@@ -3080,12 +3080,7 @@
     "2f7025800947e5b58190": {
         "build": "gitlab-ce",
         "versions": [
-<<<<<<< HEAD
             "17.4.0"
-=======
-            "17.4.0",
-            "17.4.1"
->>>>>>> 172b7cf (manual run)
         ]
     },
     "2f70f228973da802c87bfab815aed6f86bfbe3e4": {