diff options
| author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-06-05 14:47:51 +0200 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-06-05 14:47:51 +0200 |
| commit | 27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93 (patch) | |
| tree | ec432d27997c9be6cda977515839476c98de4fe4 /doc | |
| parent | 7e41eca38ae4598e083372777c20ff6aa2b491ad (diff) | |
| download | gitlab-ce-27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93.tar.gz | |
Remove conflict artifact.
Diffstat (limited to 'doc')
| -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. |