diff options
| -rw-r--r-- | doc/getting_started/index.txt | 4 |
1 files changed, 0 insertions, 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 |