summaryrefslogtreecommitdiffhomepage
path: root/ko-kr
diff options
context:
space:
mode:
authorAdam <adam@adambard.com>2013-09-04 09:36:51 -0700
committerAdam <adam@adambard.com>2013-09-04 09:36:51 -0700
commitee8bed8c98df81e63b430ab5e61096f8140f09b5 (patch)
treeedf3b021c9b8f895d6b6ded6e8ed8259b8613790 /ko-kr
parent20c866041845a8cc438fce4a0cceb18cb940774d (diff)
Fixed up potential conflicts
Diffstat (limited to 'ko-kr')
-rw-r--r--ko-kr/clojure-kr.html.markdown2
-rw-r--r--ko-kr/python-kr.html.markdown4
2 files changed, 3 insertions, 3 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)