Commit 4a484537 authored by larowlan's avatar larowlan

Merge remote-tracking branch 'origin/8.x-1.x' into 8.x-1.x

Conflicts:
	default_content.services.yml
	src/DefaultContentManager.php
parents f36243e6 ac07c891
......@@ -61,6 +61,7 @@ class DefaultContentManager implements DefaultContentManagerInterface {
protected $entityManager;
/**
<<<<<<< HEAD
* The entity repository.
*
* @var \Drupal\Core\Entity\EntityRepositoryInterface
......@@ -68,6 +69,8 @@ class DefaultContentManager implements DefaultContentManagerInterface {
protected $entityRepository;
/**
=======
>>>>>>> origin/8.x-1.x
* The module handler.
*
* @var \Drupal\Core\Extension\ModuleHandlerInterface
......@@ -300,7 +303,7 @@ class DefaultContentManager implements DefaultContentManagerInterface {
}
/**
* {@inheritdoc{
* {@inheritdoc}
*/
public function writeDefaultContent($serialized_by_type, $folder) {
foreach ($serialized_by_type as $entity_type => $serialized_entities) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment