From 9a06cdcd484a9d718e4f9b4202b102e13772933d Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 8 Aug 2013 07:17:55 -0500 Subject: doc: Remove merge cruft Signed-off-by: Sol Jerome --- doc/getting_started/index.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/getting_started/index.txt b/doc/getting_started/index.txt index 135346e41..9b69bf65a 100644 --- a/doc/getting_started/index.txt +++ b/doc/getting_started/index.txt @@ -206,11 +206,7 @@ real ``/etc/motd`` file to that location, run the client again, and you will find that we now have a correct entry:: Loaded tool drivers: -<<<<<<< HEAD - Chkconfig POSIX Action RPM -======= Chkconfig POSIX YUM ->>>>>>> maint Phase: initial Correct entries: 1 -- cgit v1.2.3-1-g7c22