summaryrefslogtreecommitdiff
path: root/doc/generated/examples/mergeflags_MergeFlags1_1.xml
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-08-21 16:12:03 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-08-21 16:12:03 -0700
commit07cb57596ce6bb3c01878d921a1a5a3278e98d39 (patch)
tree579883acdd0cfc5c37fc75118023cb60fb917973 /doc/generated/examples/mergeflags_MergeFlags1_1.xml
parent7724d48f05f7a739d7b500c770be6752353a6919 (diff)
parent5d2a72eec7077c6b39d89da6393ab91fa482e4a1 (diff)
downloadscons-07cb57596ce6bb3c01878d921a1a5a3278e98d39.tar.gz
merge
Diffstat (limited to 'doc/generated/examples/mergeflags_MergeFlags1_1.xml')
-rw-r--r--doc/generated/examples/mergeflags_MergeFlags1_1.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
index 1697d6c3..8a0c336a 100644
--- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>