Commit f50acdc7 authored by alexpott's avatar alexpott
Browse files

Issue #2406131 by znerol: Remove stray merge conflict marker from DbUpdateController

parent 2b1f9f48
......@@ -69,7 +69,6 @@ class DbUpdateController extends ControllerBase {
protected $entityDefinitionUpdateManager;
/**
<<<<<<< ours
* The bare HTML page renderer.
*
* @var \Drupal\Core\Render\BareHtmlPageRendererInterface
......
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