diff options
| author | Bertrand Garrigues <bertrand.garrigues@laposte.net> | 2015-03-11 23:09:59 +0100 |
|---|---|---|
| committer | Bertrand Garrigues <bertrand.garrigues@laposte.net> | 2015-03-11 23:09:59 +0100 |
| commit | 2775284abea472ae644eff6e8cdbc0a72206a6ce (patch) | |
| tree | 13da488f663fec51b352c4979c2f0f1bb719e39d /INSTALL.REPO | |
| parent | 96b1a1b0c9840f5922baf3e6e9f28f1dea6e3dc6 (diff) | |
| download | groff-git-2775284abea472ae644eff6e8cdbc0a72206a6ce.tar.gz | |
Clean conflict lines left in INSTALL.REPO
Diffstat (limited to 'INSTALL.REPO')
| -rw-r--r-- | INSTALL.REPO | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/INSTALL.REPO b/INSTALL.REPO index 75922a2cb..37949e8ed 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -56,12 +56,8 @@ the `config.status' script; it is the `config.status' script generates the Makefile) and call 'make' to build the groff project. You can do it in the source tree: -<<<<<<< HEAD -To update file `aclocal.m4', run the shell command -======= $ ./configure $ make ->>>>>>> Fixes after final complete tests: You can also build groff in an out of source build tree, which is cleaner: @@ -89,10 +85,6 @@ Just ignore this. It doesn't occur in the actual versions of `autoreconf'. -<<<<<<< HEAD - $ autoconf -I m4 -======= ->>>>>>> Fixes after final complete tests: 2. Modification of autotools files ---------------------------------- @@ -117,15 +109,3 @@ groff is available in doc/automake.mom. It is currently not automatically generated, to build it: pdfmom automake.mom > automake.pdf - -<<<<<<< HEAD -After the use of the `GNU autotools', the usual compilation should -work. If the run of `configure' produces error reports you have -produced errors in the `autotools' modification. - -##### Emacs settings -Local Variables: -mode: text -End: -======= ->>>>>>> Fixes after final complete tests: |