diff options
author | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
---|---|---|
committer | Hunter Stevens <onebree@gmail.com> | 2016-02-15 17:47:35 -0500 |
commit | d0b067b140d3d351ae9dee0b3e542935b7ca35d4 (patch) | |
tree | b83501b5b82240663029d7382f873fb369ea81c7 /ko-kr | |
parent | cffb7e6770b517a620115b3a9e1f82ca1dd82a98 (diff) | |
parent | cd16626c8f64a29d8235bd0ab21c7a32e248928f (diff) |
Resolve conflicts from merge
Diffstat (limited to 'ko-kr')
-rw-r--r-- | ko-kr/bf-kr.html.markdown (renamed from ko-kr/brainfuck-kr.html.markdown) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ko-kr/brainfuck-kr.html.markdown b/ko-kr/bf-kr.html.markdown index c2e4341f..3d366d7c 100644 --- a/ko-kr/brainfuck-kr.html.markdown +++ b/ko-kr/bf-kr.html.markdown @@ -1,5 +1,5 @@ --- -language: brainfuck +language: bf contributors: - ["Prajit Ramachandran", "http://prajitr.github.io/"] - ["Mathias Bynens", "http://mathiasbynens.be/"] |