From cafe6ec990087dffe828f03be7c9b003709e2197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sarstr=C3=B6m?= Date: Tue, 9 Nov 2021 10:53:51 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20merge=20conflict?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/api-skolplattformen/devrun.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libs/api-skolplattformen/devrun.js b/libs/api-skolplattformen/devrun.js index 0a29f02a..b0826491 100644 --- a/libs/api-skolplattformen/devrun.js +++ b/libs/api-skolplattformen/devrun.js @@ -20,10 +20,6 @@ const fs = require('fs') const HttpProxyAgent = require('https-proxy-agent') const agentWrapper = require('./agentFetchWrapper') const init = require('./dist/api-skolplattformen/lib').default -<<<<<<< HEAD -======= - ->>>>>>> 79502a4f09450068527dadf7fd83e2a0386610d9 const [, , personalNumber] = process.argv process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'