diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-03-01 08:45:42 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-03-01 08:45:42 (GMT) |
| commit | 14924bcc1713c5bd7dcf4db5b420204407048889 (patch) | |
| tree | a679d247d04daf78f0a58ee0bb05afa04488704a /doc/generated/examples/troubleshoot_explain1_3.xml | |
| parent | 193c96046004369ba13fb9b4fc0e992513cc8f78 (diff) | |
| parent | 3791dc82915d61f0b9eee4738fc090c8a23b162c (diff) | |
| download | SCons-14924bcc1713c5bd7dcf4db5b420204407048889.zip SCons-14924bcc1713c5bd7dcf4db5b420204407048889.tar.gz SCons-14924bcc1713c5bd7dcf4db5b420204407048889.tar.bz2 | |
Resolved conflicting merge.
Diffstat (limited to 'doc/generated/examples/troubleshoot_explain1_3.xml')
| -rw-r--r-- | doc/generated/examples/troubleshoot_explain1_3.xml | 2 |
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 3d8592d..7e495ea 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 "/scons/as_scons/bootstrap/src/script/scons.py", line 199, in <module> +File "/home/ghost/projects/scons/bootstrap/src/script/scons.py", line 199, in <module> </screen> |