From 124fbf9b6d5a761cd10c43f9e92bb3481b90df6e Mon Sep 17 00:00:00 2001
From: ivaosthu <ivar.conradi.osthus@finn.no>
Date: Wed, 17 Jan 2018 15:39:53 +0100
Subject: [PATCH] Fix rebase error

---
 examples/client-auth-unleash.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/examples/client-auth-unleash.js b/examples/client-auth-unleash.js
index 743d547f69..13ad5b741e 100644
--- a/examples/client-auth-unleash.js
+++ b/examples/client-auth-unleash.js
@@ -9,10 +9,7 @@ const sharedSecret = '12312Random';
 unleash
     .start({
         databaseUrl: 'postgres://unleash_user:passord@localhost:5432/unleash',
-<<<<<<< HEAD
         enableLegacyRoutes: false,
-=======
->>>>>>> 0681945... Document how to secure client api #231
         preRouterHook: app => {
             app.use('/api/client', (req, res, next) => {
                 if (req.headers.authorization === sharedSecret) {