diff options
| author | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 | 
|---|---|---|
| committer | David Hsieh <davidhsiehlo@gmail.com> | 2016-03-11 08:39:26 -0600 | 
| commit | 8d1e2e31ef9c62e2833ccb83cde78caef668f044 (patch) | |
| tree | 1cca5af13a146c0a36ef760b6264d18875290ec0 /ta_in | |
| parent | 51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (diff) | |
| parent | 6e38442b857a9d8178b6ce6713b96c52bf4426eb (diff) | |
Merge conflict r-spanish
Diffstat (limited to 'ta_in')
| -rw-r--r-- | ta_in/css-ta.html.markdown (renamed from ta_in/css.html.markdown) | 6 | ||||
| -rw-r--r-- | ta_in/javascript-ta.html.markdown (renamed from ta_in/javascript.html.markdown) | 4 | ||||
| -rw-r--r-- | ta_in/json-ta.html.markdown (renamed from ta_in/json.html.markdown) | 0 | ||||
| -rw-r--r-- | ta_in/xml-ta.html.markdown (renamed from ta_in/xml.html.markdown) | 4 | 
4 files changed, 7 insertions, 7 deletions
| diff --git a/ta_in/css.html.markdown b/ta_in/css-ta.html.markdown index 56f94ed0..cbe88f1e 100644 --- a/ta_in/css.html.markdown +++ b/ta_in/css-ta.html.markdown @@ -7,9 +7,9 @@ contributors:      - ["Connor Shea", "https://github.com/connorshea"]      - ["Deepanshu Utkarsh", "https://github.com/duci9y"]  translators: -	- ["Rasendran Kirushan", "https://github.com/kirushanr"] -filename: learncss.css -lang:in-ta +    - ["Rasendran Kirushan", "https://github.com/kirushanr"] +filename: learncss-ta.css +lang: in-ta  --- diff --git a/ta_in/javascript.html.markdown b/ta_in/javascript-ta.html.markdown index f0b0a36a..d3fe5a85 100644 --- a/ta_in/javascript.html.markdown +++ b/ta_in/javascript-ta.html.markdown @@ -5,8 +5,8 @@ contributors:      - ['Ariel Krakowski', 'http://www.learneroo.com']  translators:    - ["Rasendran Kirushan", "https://github.com/kirushanr"] -filename: javascript.js -lang:in-ta +filename: javascript-ta.js +lang: in-ta  ---  javascript 1995 ஆம்  ஆண்டு Netscape இல் பணிபுரிந்த Brendan Eich diff --git a/ta_in/json.html.markdown b/ta_in/json-ta.html.markdown index d85e0d82..d85e0d82 100644 --- a/ta_in/json.html.markdown +++ b/ta_in/json-ta.html.markdown diff --git a/ta_in/xml.html.markdown b/ta_in/xml-ta.html.markdown index a9bfa9cd..d782399d 100644 --- a/ta_in/xml.html.markdown +++ b/ta_in/xml-ta.html.markdown @@ -1,11 +1,11 @@  ---  language: xml -filename: learnxml.xml +filename: learnxml-ta.xml  contributors:    - ["João Farias", "https://github.com/JoaoGFarias"]  translators:    - ["Rasendran Kirushan", "https://github.com/kirushanr"] -lang:in-ta +lang: in-ta  --- | 
