diff options
| author | Adam <adam@adambard.com> | 2013-12-11 21:27:04 -0800 |
|---|---|---|
| committer | Adam <adam@adambard.com> | 2013-12-11 21:27:04 -0800 |
| commit | 48d9eecbfd6b53895c719c4903850cc8a561014c (patch) | |
| tree | 59a3b7e891cdfed9936769dfda6c39883d0134e2 /zh-cn | |
| parent | d90bd7426ddbc27bee4678ae7c1f4fb92a63e5c8 (diff) | |
Fixed merge conflict
Diffstat (limited to 'zh-cn')
| -rw-r--r-- | zh-cn/common-lisp.html.markdown | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/zh-cn/common-lisp.html.markdown b/zh-cn/common-lisp.html.markdown index 9cc24198..e623ad1a 100644 --- a/zh-cn/common-lisp.html.markdown +++ b/zh-cn/common-lisp.html.markdown @@ -11,11 +11,7 @@ lang: zh-cn ANSI Common Lisp 是一个广泛通用于各个工业领域的、支持多种范式的编程语言。 这门语言也经常被引用作“可编程的编程语言”（可以写代码的代码）。 -<<<<<<< HEAD 经典的入门点为[已完全免费提供的《实用 Common Lisp 编程》](http://www.gigamonkeys.com/book/) -======= -经典的入门点为[已经完全免费提供的实用Common Lisp编程](http://www.gigamonkeys.com/book/) ->>>>>>> parent of 8675133... temp 另外还有一本近期内比较热门的 [Land of Lisp](http://landoflisp.com/). |