opendev/gerrit
Code Issues Proposed changes

linux-quickstart: Remove leftover conflict marker

Browse Source 
Change-Id: Ie4cbe330b372b1c4f209d6fd60ea96e99c9befa2
This commit is contained in:
David Pursehouse 2018-08-23 12:30:01 +09:00
parent 7167a9ab55
commit 9605feda11
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/linux-quickstart.txt
View File

@ -16,7 +16,6 @@ link:install.html[Standalone Daemon Installation Guide].
Be sure you have: Be sure you have:
<<<<<<< HEAD
. A Unix-based server, including any Linux flavor, MacOS, or Berkeley Software . A Unix-based server, including any Linux flavor, MacOS, or Berkeley Software
Distribution (BSD). Distribution (BSD).
. Java SE Runtime Environment version 1.8. Gerrit is not compatible with Java . Java SE Runtime Environment version 1.8. Gerrit is not compatible with Java