diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 18:46:09 +0400 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-06-05 18:46:09 +0400 |
| commit | 63cbebfe6c2229dd2c65bd82ee1b97aed5bcabbf (patch) | |
| tree | 6b46920cfee352d2b9502fc7ba743d757bf33494 | |
| parent | 70a6af9328b663c93a5802bf689362525ec4ae87 (diff) | |
| parent | 27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93 (diff) | |
Merge pull request #7081 from cirosantilli/conflict-artifact
Remove conflict artifact.
| -rw-r--r-- | doc/install/requirements.md | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 575df915a20..d7c4c4da2ed 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -41,7 +41,6 @@ Please consider using a virtual machine to run GitLab. GitLab requires Ruby (MRI) 2.0 or 2.1 ->>>>>>> Update docs to markdown style guide. You will have to use the standard MRI implementation of Ruby. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions. |