summaryrefslogtreecommitdiffstats
path: root/doc/generated/examples/troubleshoot_explain1_3.xml
diff options
context:
space:
mode:
authorRussel Winder <russel@winder.org.uk>2016-04-10 09:41:00 (GMT)
committerRussel Winder <russel@winder.org.uk>2016-04-10 09:41:00 (GMT)
commit6a37189174372c9c98c63ada58ab4352adf650e8 (patch)
tree521ddb1071569fa90100e11d7f03af13d5689aaf /doc/generated/examples/troubleshoot_explain1_3.xml
parent14924bcc1713c5bd7dcf4db5b420204407048889 (diff)
parent3e0a831c7fcd60384266e14641a3a15f2cba1ced (diff)
downloadSCons-6a37189174372c9c98c63ada58ab4352adf650e8.zip
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.gz
SCons-6a37189174372c9c98c63ada58ab4352adf650e8.tar.bz2
Commit resolved conflicted merge.
Diffstat (limited to 'doc/generated/examples/troubleshoot_explain1_3.xml')
-rw-r--r--doc/generated/examples/troubleshoot_explain1_3.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml
index 7e495ea..3d8592d 100644
--- a/doc/generated/examples/troubleshoot_explain1_3.xml
+++ b/doc/generated/examples/troubleshoot_explain1_3.xml
@@ -3,5 +3,5 @@
cp file.in file.oout
scons: warning: Cannot find target file.out after building
-File "/home/ghost/projects/scons/bootstrap/src/script/scons.py", line 199, in &lt;module&gt;
+File "/scons/as_scons/bootstrap/src/script/scons.py", line 199, in &lt;module&gt;
</screen>