<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">This is something (merge conflict) that was caused by "pull" operation. Did you try to redownload the code?<div><br></div><div>---</div><div>Alex</div><div><br><div><div>On Jun 15, 2013, at 6:54 AM, 陈胜蓝 <<a href="mailto:blindeafer@163.com">blindeafer@163.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="line-height: 1.7; font-size: 14px; font-family: arial; ">Hi All,<div>Today,I updated the code,but then when I compiling it: ./waf configure --boost-includes=/usr/local/include --boost-libs=/usr/local/lib</div><div>it return a error:</div><div><div>Waf: The wscript in '/home/lam/ndnSIM/ns-3' is unreadable</div><div>Traceback (most recent call last):</div><div> File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Scripting.py", line 87, in waf_entry_point</div><div> set_main_module(Context.run_dir+os.sep+Context.WSCRIPT_FILE)</div><div> File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Scripting.py", line 110, in set_main_module</div><div> Context.g_module=Context.load_module(file_path)</div><div> File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/extras/compat15.py", line 88, in load_module</div><div> ret=rev(path)<!--!
div--><div>
File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Context.py", line 266, in load_module</div><div> exec(compile(code,path,'exec'),module.__dict__)</div><div> File "/home/lam/ndnSIM/ns-3/wscript", line 11</div><div> <<<<<<< HEAD</div><div> ^</div><div><span style="line-height: 1.7;">SyntaxError: invalid syntax</span></div></div><div><br></div><div>How can I solve it?</div></div></div></blockquote></div><br></div></body></html>