From c292c31ae1c9674d379fd52a328adc93a6703c36 Mon Sep 17 00:00:00 2001
From: valerijf <valerijf@yahoo-inc.com>
Date: Wed, 24 Aug 2016 16:22:00 +0200
Subject: Fixed git merge error during last revert PR

---
 node-admin/src/main/application/services.xml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'node-admin/src/main/application')

diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index bcb489fdf48..fa7307fc5eb 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -7,11 +7,6 @@
     </handler>
     <component id="node-admin" class="com.yahoo.vespa.hosted.node.admin.provider.ComponentsProviderImpl" bundle="node-admin"/>
     <component id="docker" class="com.yahoo.vespa.hosted.node.admin.docker.DockerImpl" bundle="node-admin"/>
-<<<<<<< HEAD
-    <component id="docker-api" class="com.yahoo.vespa.hosted.docker.api.docker.DockerApi" bundle="node-admin"/>
-
-=======
->>>>>>> parent of e8390df... DO NOT MERGE THIS, just to show impact.
 
     <config name='nodeadmin.docker.docker'>
       <caCertPath>/host/docker/certs/ca_cert.pem</caCertPath>
-- 
cgit v1.2.3