8000 update · nCodefresh/examples@1feae6b · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 1feae6b

Browse files
petersirkapetersirka
committed
update
1 parent 596096d commit 1feae6b

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

‎static-file-merge/d.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<div>D</div>

‎static-file-merge/definitions/merge.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// Merging files
22
framework.merge('merge.js', '/js/a.js', '/js/b.js', 'http://www.totaljs.com/inject.js');
3-
framework.merge('together.html', 'a.html', ['b.html', 'c.html']);
3+
framework.merge('together.html', 'a.html', ['b.html', 'c.html'], '~' + framework.path.root('d.html'));

0 commit comments

Comments
 (0)
0