[ndnSIM] Waf: The wscript in './ndnSIM/ns-3' is unreadable

[Alex Afanasyev]

This is something (merge conflict) that was caused by "pull" operation.  Did you try to redownload the code?

---
Alex

On Jun 15, 2013, at 6:54 AM, 陈胜蓝 <blindeafer at 163.com> wrote:

> Hi All,
> Today,I updated the code,but then when I compiling it: ./waf configure --boost-includes=/usr/local/include --boost-libs=/usr/local/lib
> it return a error:
> Waf: The wscript in '/home/lam/ndnSIM/ns-3' is unreadable
> Traceback (most recent call last):
>   File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Scripting.py", line 87, in waf_entry_point
>     set_main_module(Context.run_dir+os.sep+Context.WSCRIPT_FILE)
>   File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Scripting.py", line 110, in set_main_module
>     Context.g_module=Context.load_module(file_path)
>   File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/extras/compat15.py", line 88, in load_module
>     ret=rev(path)
>   File "/home/lam/ndnSIM/ns-3/.waf-1.6.11-30618c54883417962c38f5d395f83584/waflib/Context.py", line 266, in load_module
>     exec(compile(code,path,'exec'),module.__dict__)
>   File "/home/lam/ndnSIM/ns-3/wscript", line 11
>     <<<<<<< HEAD
>      ^
> SyntaxError: invalid syntax
> 
> How can I solve it?

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.lists.cs.ucla.edu/pipermail/ndnsim/attachments/20130615/228d1d56/attachment.html>