Skip to content

Commit 88cfbf8

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 5406652 + 8cfc468 commit 88cfbf8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

archetypes/build.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,9 +411,9 @@
411411
<replacetoken><![CDATA[<fileSet encoding="UTF-8">
412412
<directory>src/main/resources</directory>
413413
<includes>
414-
<include>**/*.js</include>
415-
<include>**/*.tml</include>
416414
<include>**/*.css</include>
415+
<include>**/*.tml</include>
416+
<include>**/*.js</include>
417417
</includes>
418418
</fileSet>]]></replacetoken>
419419
<replacevalue><![CDATA[<fileSet packaged="true" encoding="UTF-8">
@@ -445,9 +445,9 @@
445445
<replacetoken><![CDATA[<fileSet encoding="UTF-8">
446446
<directory>src/main/resources</directory>
447447
<includes>
448-
<include>**/*.js</include>
449-
<include>**/*.tml</include>
450448
<include>**/*.css</include>
449+
<include>**/*.tml</include>
450+
<include>**/*.js</include>
451451
</includes>
452452
</fileSet>]]></replacetoken>
453453
<replacevalue><![CDATA[<fileSet packaged="true" encoding="UTF-8">

0 commit comments

Comments
 (0)