diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /solaris/quagga.init.in | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'solaris/quagga.init.in')
| -rwxr-xr-x | solaris/quagga.init.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/solaris/quagga.init.in b/solaris/quagga.init.in index b489b28e..a85686be 100755 --- a/solaris/quagga.init.in +++ b/solaris/quagga.init.in @@ -20,7 +20,11 @@ # 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 |