Permalink
Browse files

fixing conflicts

  • Loading branch information...
2 parents 95286b7 + 49d7e07 commit 48c198b2e5fde0449a1b1d8d26041dc1802a7839 Divya Manian committed Jan 31, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 build.xml
View
@@ -721,6 +721,7 @@
<echo message="copying ${file.manifest} to /${dir.publish}"/>
<copy file="${dir.intermediate}/${file.manifest}" tofile="${dir.publish}/${file.manifest}" />
+ <!-- add manifest attribute -->
<echo>Add manifest attribute to HTML: </echo>
<replaceregexp match="&lt;html (.*?!\?)&gt;" replace='&lt;html \1 manifest="${file.manifest}"&gt;' flags="g">
<fileset dir="./${dir.intermediate}" includes="${page-files}"/>

0 comments on commit 48c198b

Please sign in to comment.