Fixed merge conflict

This commit is contained in:
Gidon
2014-08-24 09:57:53 +03:00
218 changed files with 21713 additions and 5840 deletions
@@ -1,9 +1,9 @@
/// <reference path="js-url.d.ts" />
url();
url('domain');
url(1);
url('domain', 'test.www.example.com/path/here');
url(-1, 'test.www.example.com/path/here');
/// <reference path="js-url.d.ts" />
url();
url('domain');
url(1);
url('domain', 'test.www.example.com/path/here');
url(-1, 'test.www.example.com/path/here');