Fixed up potential conflicts

This commit is contained in:
Adam 2013-09-04 09:36:51 -07:00
parent 20c8660418
commit ee8bed8c98
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
--- ---
language: clojure language: clojure
filename: learnclojure.clj filename: learnclojure-kr.clj
contributors: contributors:
- ["Adam Bard", "http://adambard.com/"] - ["Adam Bard", "http://adambard.com/"]
translators: translators:

View File

@ -3,7 +3,7 @@ language: python
category: language category: language
contributors: contributors:
- ["Louie Dinh", "http://ldinh.ca"] - ["Louie Dinh", "http://ldinh.ca"]
filename: learnpython.py filename: learnpython-ko.py
translators: translators:
- ["wikibook", "http://wikibook.co.kr"] - ["wikibook", "http://wikibook.co.kr"]
lang: ko-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) * [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) * [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) * [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)

View File

@ -4,7 +4,7 @@ contributors:
- ["Louie Dinh", "http://ldinh.ca"] - ["Louie Dinh", "http://ldinh.ca"]
translators: translators:
- ["Ovidiu Ciule", "https://github.com/ociule"] lang: ro-ro filename: python-ro.html.markdown - ["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 Python a fost creat de Guido Van Rossum la începutul anilor '90. Python a devenit astăzi unul din