From fb979231f39067c0bb87fcb0a103676bc1f97b7f Mon Sep 17 00:00:00 2001
From: Erik Krogh Kristensen <erik-krogh@github.com>
Date: Wed, 15 Dec 2021 14:22:40 +0100
Subject: [PATCH] QL: merge the .codeqlmanifest.json file in the root

---
 .codeqlmanifest.json    |  4 +++-
 ql/.codeqlmanifest.json | 10 ----------
 2 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 ql/.codeqlmanifest.json

diff --git a/.codeqlmanifest.json b/.codeqlmanifest.json
index f14b408a83ce..0767ce6ffff7 100644
--- a/.codeqlmanifest.json
+++ b/.codeqlmanifest.json
@@ -11,7 +11,9 @@
         "misc/legacy-support/*/qlpack.yml",
         "misc/suite-helpers/qlpack.yml",
         "ruby/extractor-pack/codeql-extractor.yml",
-        "ruby/ql/consistency-queries/qlpack.yml"
+        "ruby/ql/consistency-queries/qlpack.yml",
+        "ql/ql/consistency-queries/qlpack.yml",
+        "ql/extractor-pack/codeql-extractor.yml"
     ],
     "versionPolicies": {
       "default": {
diff --git a/ql/.codeqlmanifest.json b/ql/.codeqlmanifest.json
deleted file mode 100644
index 63200dbfc958..000000000000
--- a/ql/.codeqlmanifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "provide": [
-        "ql/src/qlpack.yml",
-        "ql/consistency-queries/qlpack.yml",
-        "ql/test/qlpack.yml",
-        "ql/examples/qlpack.yml",
-        "upgrades/qlpack.yml",
-        "extractor-pack/codeql-extractor.yml"
-    ]
-}