linux-quickstart: Remove leftover conflict marker
Change-Id: Ie4cbe330b372b1c4f209d6fd60ea96e99c9befa2
This commit is contained in:
parent
7167a9ab55
commit
9605feda11
@ -16,7 +16,6 @@ link:install.html[Standalone Daemon Installation Guide].
|
||||
|
||||
Be sure you have:
|
||||
|
||||
<<<<<<< HEAD
|
||||
. A Unix-based server, including any Linux flavor, MacOS, or Berkeley Software
|
||||
Distribution (BSD).
|
||||
. Java SE Runtime Environment version 1.8. Gerrit is not compatible with Java
|
||||
|
Loading…
Reference in New Issue
Block a user