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 /fa-ir | |
| parent | cffb7e6770b517a620115b3a9e1f82ca1dd82a98 (diff) | |
| parent | cd16626c8f64a29d8235bd0ab21c7a32e248928f (diff) | |
Resolve conflicts from merge
Diffstat (limited to 'fa-ir')
| -rw-r--r-- | fa-ir/bf-fa.html.markdown (renamed from fa-ir/brainfuck.html.markdown) | 2 | ||||
| -rw-r--r-- | fa-ir/javascript-fa.html.markdown (renamed from fa-ir/javascript.html.markdown) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fa-ir/brainfuck.html.markdown b/fa-ir/bf-fa.html.markdown index ef2bcba3..bc5d8dc4 100644 --- a/fa-ir/brainfuck.html.markdown +++ b/fa-ir/bf-fa.html.markdown @@ -1,5 +1,5 @@ --- -language: brainfuck +language: bf contributors: - ["Mohammad Valipour", "https://github.com/mvalipour"] lang: fa-ir diff --git a/fa-ir/javascript.html.markdown b/fa-ir/javascript-fa.html.markdown index fe3555af..fe3555af 100644 --- a/fa-ir/javascript.html.markdown +++ b/fa-ir/javascript-fa.html.markdown |