fix: 🐛 Merge with master

Zingo21 · Nov 9, 2021 · 9d21341 · 9d21341
2 parents 4f1f66f + 79502a4
commit 9d21341
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/libs/api-skolplattformen/devrun.js b/libs/api-skolplattformen/devrun.js
@@ -20,6 +20,10 @@ 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'

diff --git a/libs/api-skolplattformen/lib/api.ts b/libs/api-skolplattformen/lib/api.ts
@@ -2,7 +2,6 @@ import { EventEmitter } from 'events'
 import { decode } from 'he'
 import { DateTime } from 'luxon'
 import * as html from 'node-html-parser'
-import { Language } from '@skolplattformen/curriculum'
 import { LoginStatusChecker } from '../../api/lib/loginStatus'
 import {
   AuthTicket,
@@ -28,6 +27,7 @@ import wrap, { Fetcher, FetcherOptions } from '../../api/lib/fetcher'
 import * as fake from './fakeData'
 import { checkStatus } from './loginStatusChecker'
 import { Api } from '../../api/lib/api'
+import { Language } from '@skolplattformen/curriculum'
 
 const fakeResponse = <T>(data: T): Promise<T> =>
   new Promise((res) => setTimeout(() => res(data), 200 + Math.random() * 800))