1
0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00

Fix rebase error

This commit is contained in:
ivaosthu 2018-01-17 15:39:53 +01:00 committed by Ivar Conradi Østhus
parent d7c1360cc7
commit 124fbf9b6d

View File

@ -9,10 +9,7 @@ const sharedSecret = '12312Random';
unleash unleash
.start({ .start({
databaseUrl: 'postgres://unleash_user:passord@localhost:5432/unleash', databaseUrl: 'postgres://unleash_user:passord@localhost:5432/unleash',
<<<<<<< HEAD
enableLegacyRoutes: false, enableLegacyRoutes: false,
=======
>>>>>>> 0681945... Document how to secure client api #231
preRouterHook: app => { preRouterHook: app => {
app.use('/api/client', (req, res, next) => { app.use('/api/client', (req, res, next) => {
if (req.headers.authorization === sharedSecret) { if (req.headers.authorization === sharedSecret) {