fix: 🐛 merge conflict

2021-11-09 10:53:51 +01:00 · 2021-11-09 10:53:51 +01:00 · cafe6ec990
parent 9d213413be
commit cafe6ec990
1 changed files with 0 additions and 4 deletions
--- 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'