fix express 3.1 definitions to be used as a module #264

2026-09-09 11:13:57 +08:00 · 2013-02-11 11:56:36 -02:00
parent ae4876ab35
commit e7d32b654f
2 changed files with 2 additions and 1163 deletions
@@ -1,10 +1,6 @@
 /// <reference path="express-3.1.d.ts" />

-<<<<<<< HEAD
 import express = module('express');
-=======
-var express = <Express>require('express');
->>>>>>> 283e996bd224b71b3c52e4ee44a25df5b53bc3c6
 var app = express();

 //////////////////////////