summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Hsieh <davidhsiehlo@gmail.com>2016-03-11 08:33:58 -0600
committerDavid Hsieh <davidhsiehlo@gmail.com>2016-03-11 08:33:58 -0600
commit51c2f7ce28caf1cc654bcafc4063f3012cc2f0c3 (patch)
tree21a743c227995a980d2cac71d89cb8abf19698f4
parentf02ad99fdd90c4c522e00aca3b46a0db5dd24083 (diff)
Removed a conflicting line for PR merge
-rw-r--r--r.html.markdown1
1 files changed, 0 insertions, 1 deletions
diff --git a/r.html.markdown b/r.html.markdown
index fbc87b0e..b7bd6801 100644
--- a/r.html.markdown
+++ b/r.html.markdown
@@ -2,7 +2,6 @@
language: R
contributors:
- ["e99n09", "http://github.com/e99n09"]
- - ["isomorphismes", "http://twitter.com/isomorphisms"]
filename: learnr.r
---