BSD fixes #284: Fixed conflicts

Bixal · Sep 4, 2024 · 15774f6 · 15774f6
1 parent ea2e471
commit 15774f6
Show file tree

Hide file tree

Showing 3 changed files with 183 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,18 @@
             "type": "composer",
             "url": "https://packages.drupal.org/8"
         },
+        {
+            "type": "package",
+            "package": {
+                "name": "northernco/ckeditor5-anchor-drupal",
+                "version": "0.5.0",
+                "type": "drupal-library",
+                "dist": {
+                    "url": "https://registry.npmjs.org/@northernco/ckeditor5-anchor-drupal/-/ckeditor5-anchor-drupal-0.5.0.tgz",
+                    "type": "tar"
+                }
+            }
+        },
         {
             "type": "package",
             "package": {
@@ -37,11 +49,13 @@
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "drupal/admin_toolbar": "^3.4",
+        "drupal/anchor_link": "^3.0@beta",
         "drupal/autocomplete_deluxe": "^2.0",
         "drupal/chosen": "^4.0",
         "drupal/components": "^3.0@beta",
         "drupal/config_ignore": "^3.3",
         "drupal/config_split": "^2.0",
+        "drupal/cookies": "^1.2",
         "drupal/core-composer-scaffold": "^10.1",
         "drupal/core-project-message": "^10.1",
         "drupal/core-recommended": "^10.1",
@@ -80,6 +94,7 @@
         "mattsqd/drupal-env": "dev-main",
         "mattsqd/drupal-env-lando": "dev-main",
         "mattsqd/robovalidate": "@alpha",
+        "northernco/ckeditor5-anchor-drupal": "^0.5.0",
         "platformsh/config-reader": "^2.4"
     },
     "conflict": {

diff --git a/composer.lock b/composer.lock
diff --git a/composer.log b/composer.log
@@ -35,3 +35,6 @@ d0b264b8bfd2f16b57808145e6c7b950|Matt Poole|feature/BSD-212-smpt-enable|Tue Jul
 59d81fa4a3cb5b4021dd9824956e194c|Matt Poole|feature/BSD-271-validation-action|Tue Aug  6 13:13:48 EDT 2024|./composer.sh update mattsqd/robovalidate
 8a08b6d45145b305c16131bd11430688|Matt Poole|feature/BSD-278-update-deps|Thu Aug 15 12:05:25 EDT 2024|./composer.sh update
 bb805ef6ca0a258d1c8306f0b36fafec|Matt Poole|feature/BSD-287-update-deps|Wed Sep  4 10:41:04 EDT 2024|./composer.sh update
+30ef2bb0122b978360bda4a19c3c9b00|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep  4 16:48:48 EDT 2024|./composer.sh require drupal/cookies
+45572e7bbb597f5c3740a8c9063c9496|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep  4 16:48:59 EDT 2024|./composer.sh require drupal/anchor_link:^3.0@beta
+a64a80ee97032a4a2898228866cf865f|Matt Poole|feature/BSD-284-gdpr-compliance|Wed Sep  4 16:49:08 EDT 2024|./composer.sh require northernco/ckeditor5-anchor-drupal