mirror of
https://github.com/wassname/DefinitelyTyped.git
synced 2026-09-09 11:13:57 +08:00
Fixed merge conflict
This commit is contained in:
@@ -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');
|
||||
Reference in New Issue
Block a user