diff options
| author | Adam <adam@adambard.com> | 2013-09-04 09:36:51 -0700 |
|---|---|---|
| committer | Adam <adam@adambard.com> | 2013-09-04 09:36:51 -0700 |
| commit | ee8bed8c98df81e63b430ab5e61096f8140f09b5 (patch) | |
| tree | edf3b021c9b8f895d6b6ded6e8ed8259b8613790 | |
| parent | 20c866041845a8cc438fce4a0cceb18cb940774d (diff) | |
Fixed up potential conflicts
| -rw-r--r-- | ko-kr/clojure-kr.html.markdown | 2 | ||||
| -rw-r--r-- | ko-kr/python-kr.html.markdown | 4 | ||||
| -rw-r--r-- | ro-ro/python-ro.html.markdown | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ko-kr/clojure-kr.html.markdown b/ko-kr/clojure-kr.html.markdown index 0b9d13b2..1d9e53cd 100644 --- a/ko-kr/clojure-kr.html.markdown +++ b/ko-kr/clojure-kr.html.markdown @@ -1,6 +1,6 @@ --- language: clojure -filename: learnclojure.clj +filename: learnclojure-kr.clj contributors: - ["Adam Bard", "http://adambard.com/"] translators: diff --git a/ko-kr/python-kr.html.markdown b/ko-kr/python-kr.html.markdown index a131e9a2..ed377a99 100644 --- a/ko-kr/python-kr.html.markdown +++ b/ko-kr/python-kr.html.markdown @@ -3,7 +3,7 @@ language: python category: language contributors: - ["Louie Dinh", "http://ldinh.ca"] -filename: learnpython.py +filename: learnpython-ko.py translators: - ["wikibook", "http://wikibook.co.kr"] lang: ko-kr @@ -481,4 +481,4 @@ dir(math) * [Programming Python](http://www.amazon.com/gp/product/0596158106/ref=as_li_qf_sp_asin_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0596158106&linkCode=as2&tag=homebits04-20) * [Dive Into Python](http://www.amazon.com/gp/product/1441413022/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1441413022&linkCode=as2&tag=homebits04-20) -* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20)
\ No newline at end of file +* [Python Essential Reference](http://www.amazon.com/gp/product/0672329786/ref=as_li_tf_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=0672329786&linkCode=as2&tag=homebits04-20) diff --git a/ro-ro/python-ro.html.markdown b/ro-ro/python-ro.html.markdown index 0654fc8f..36ea78ec 100644 --- a/ro-ro/python-ro.html.markdown +++ b/ro-ro/python-ro.html.markdown @@ -4,7 +4,7 @@ contributors: - ["Louie Dinh", "http://ldinh.ca"] translators: - ["Ovidiu Ciule", "https://github.com/ociule"] lang: ro-ro filename: python-ro.html.markdown -filename: learnpython.py +filename: learnpython-ro.py --- Python a fost creat de Guido Van Rossum la începutul anilor '90. Python a devenit astăzi unul din |