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

express/express-3.1-tests.ts

@@ -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();
 
 //////////////////////////