Resolve conflict
authorPeter Palfrader <peter@palfrader.org>
Mon, 27 Apr 2009 23:27:06 +0000 (01:27 +0200)
committerPeter Palfrader <peter@palfrader.org>
Mon, 27 Apr 2009 23:27:06 +0000 (01:27 +0200)
commitc8f718d7eb122ecd49125aa0fc609740588856f5
treebee1d45ac09b5b5105d69ae5ca7e11feadc26071
parent79a989c41e841b2c83456ab158028c0173ddbbc3
parent114b51b8abdcf60b23b1bee3fc6b906cf7978140
Resolve conflict
config/nagios-master.cfg