summaryrefslogtreecommitdiff
path: root/doc/generated/examples/mergeflags_MergeFlags2_1.xml
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-08-19 13:42:08 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-08-19 13:42:08 -0700
commit5d2a72eec7077c6b39d89da6393ab91fa482e4a1 (patch)
tree13f7994c9646985733c90bedf727e7b9f19e71cc /doc/generated/examples/mergeflags_MergeFlags2_1.xml
parent271bb07b12c40c266c686dc41c56dde96e5b8c61 (diff)
parentc245e92626439731a141acc0f47e1b5c2b368f8c (diff)
downloadscons-5d2a72eec7077c6b39d89da6393ab91fa482e4a1.tar.gz
merge default
Diffstat (limited to 'doc/generated/examples/mergeflags_MergeFlags2_1.xml')
-rw-r--r--doc/generated/examples/mergeflags_MergeFlags2_1.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
index aabdc46d..1312c472 100644
--- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml
@@ -7,6 +7,4 @@
^
SyntaxError: invalid syntax
-
-[?1034h
</screen>