Starter/TypeScript-Node-Starter
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript-Node-Starter.git synced 2026-03-26 20:40:53 +00:00
Code Issues Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Bowden Kelly
2019-05-10 12:37:34 -07:00
parent 36c1f1d972 a8547a4758
commit 610a8f6365
4 changed files with 2299 additions and 4156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/passport.ts
View File

@@ -5,7 +5,7 @@ import passportFacebook from "passport-facebook";
import _ from "lodash";
// import { User, UserType } from '../models/User';
import { default as User } from "../models/User";
import { User } from "../models/User";
import { Request, Response, NextFunction } from "express";
const LocalStrategy = passportLocal.Strategy;