Merge pull request #3123 from overleaf/jpa-hotfix-merge

[misc] fix merge of AuthenticationController

GitOrigin-RevId: 7945a6e3b6f0c5e816db2a02745dc75a30928392
This commit is contained in:
Jakob Ackermann 2020-08-19 11:23:14 +02:00 committed by Copybot
parent b61ab62efb
commit 694a6937c3

View file

@ -18,7 +18,6 @@ const UrlHelper = require('../Helpers/UrlHelper')
const AsyncFormHelper = require('../Helpers/AsyncFormHelper') const AsyncFormHelper = require('../Helpers/AsyncFormHelper')
const SudoModeHandler = require('../SudoMode/SudoModeHandler') const SudoModeHandler = require('../SudoMode/SudoModeHandler')
const _ = require('lodash') const _ = require('lodash')
const OError = require('@overleaf/o-error')
const { const {
acceptsJson acceptsJson
} = require('../../infrastructure/RequestContentTypeDetection') } = require('../../infrastructure/RequestContentTypeDetection')