diff options
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/Makefile.am | 4 | ||||
| -rwxr-xr-x | solaris/quagga.init.in | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/solaris/Makefile.am b/solaris/Makefile.am index e2cb4df6..674f4ebf 100644 --- a/solaris/Makefile.am +++ b/solaris/Makefile.am @@ -1,9 +1,5 @@ # Solaris packages automake file -<<<<<<< HEAD:solaris/Makefile.am -# $Id: Makefile.am,v 1.9 2008/01/13 18:52:15 paul Exp $ -======= # $Id$ ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:solaris/Makefile.am # XXX This file uses GNU make extensions. diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in index a85686be..8b298c37 100755 --- a/solaris/quagga.init.in +++ b/solaris/quagga.init.in @@ -20,11 +20,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. # -<<<<<<< HEAD:solaris/quagga.init.in -# $Id: quagga.init.in,v 1.8 2008/07/03 20:41:08 paul Exp $ -======= # $Id$ ->>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:solaris/quagga.init.in # # Starts/stops the given daemon |