removed conflict

Author: kclarkson

.circleci/config.yml

@@ -130,10 +130,6 @@ jobs:
                 name: remove transient test fixtures
                 command: ./.circleci/scripts/pantheon/09-cleanup-fixtures
 
-    # TODO:
-    # 04-merge-master
-    # 09-cleanup-fixtures
-
 workflows:
   version: 2
   build_and_test:

.gitignore

@@ -58,7 +58,7 @@ web/sites/default/files
 # Place local settings in settings.local.php
 web/sites/*/settings.local.php
 web/sites/*/services*.yml
-!web/sites/*/services.pantheon.*.yml 
+!web/sites/*/services.pantheon.*.yml
 
 # Ignore SimpleTest multi-site environment.
 web/sites/simpletest
@@ -100,6 +100,3 @@ Thumbs.db
 # SASS #
 ##########
 .sass-cache
-
-# Things in the core directory that Drupal 8 commits in the repository.
-!web/core/**/*.gz

composer.json

@@ -14,11 +14,6 @@
         "composer/installers": "^1.0.20",
         "cweagans/composer-patches": "^1.0",
         "drupal-composer/drupal-scaffold": "^2.0.1",
-        "drupal/admin_toolbar": "^1.23",
-        "drupal/config_direct_save": "^1.0",
-        "drupal/config_installer": "^1.0",
-        "drupal/console": "^1",
-        "drupal/core": "^8",
         "drupal/elastic_email": "^2.1",
         "drupal/embed": "^1.0",
         "drupal/entity_embed": "^1.0@beta",
@@ -66,7 +61,6 @@
     "conflict": {
             "drupal/drupal": "*"
     },
-    "minimum-stability": "dev",
     "prefer-stable": true,
     "autoload": {
         "classmap": [