Commit 473dfa30 authored by larowlan's avatar larowlan

Issue #2682823 by nabiyllin, andypost: Fix broken merge results

parent 3014676a
......@@ -61,7 +61,6 @@ class DefaultContentManager implements DefaultContentManagerInterface {
protected $entityManager;
/**
<<<<<<< HEAD
* The entity repository.
*
* @var \Drupal\Core\Entity\EntityRepositoryInterface
......@@ -69,8 +68,6 @@ class DefaultContentManager implements DefaultContentManagerInterface {
protected $entityRepository;
/**
=======
>>>>>>> origin/8.x-1.x
* The module handler.
*
* @var \Drupal\Core\Extension\ModuleHandlerInterface
......
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