mirror of
https://github.com/microsoft/TypeScript-Node-Starter.git
synced 2025-11-08 20:27:37 +00:00
fix conflicts
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
import * as supertest from "supertest";
|
||||
|
||||
const app = require("../src/app");
|
||||
const request = supertest(app);
|
||||
import * as app from "../src/server";
|
||||
|
||||
describe("GET /api", () => {
|
||||
const request = supertest(app);
|
||||
|
||||
Reference in New Issue
Block a user