diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-08-08 07:17:55 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-08-08 12:51:28 -0500 |
| commit | 9a06cdcd484a9d718e4f9b4202b102e13772933d (patch) | |
| tree | 18d1bc9fcb044383ca3f6f8bee6aff3342c770fc /doc/getting_started/index.txt | |
| parent | 73c61dd6c0c464f06637db750484417bc8bbb6de (diff) | |
| download | bcfg2-9a06cdcd484a9d718e4f9b4202b102e13772933d.tar.gz bcfg2-9a06cdcd484a9d718e4f9b4202b102e13772933d.tar.bz2 bcfg2-9a06cdcd484a9d718e4f9b4202b102e13772933d.zip | |
doc: Remove merge cruft
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'doc/getting_started/index.txt')
| -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 |