prefs.js

@@ -378,7 +378,7 @@ function createColumnsPrefTab ( noteBook, type, isActive )
 {
     let grid = new Gtk.Grid ( {
 	halign: Gtk.Align.FILL,
-//	margin: 18,
+	margin: 18,
         column_spacing: 12,
         row_spacing: 12,
         visible: true,

servers/genericserver.js

@@ -123,15 +123,9 @@ var GenericServer = class {
 
 //        this.monitoLog ( message.status_code );
 //        this.monitoLog ( message.response_body );
-<<<<<<< HEAD
-        message.response_headers.foreach ((name, val) => {
-//            this.monitoLog (name, val);
-        });
-=======
 //        message.response_headers.foreach ((name, val) => {
 //            this.monitoLog (name, val);
 //        });
->>>>>>> 0d8113e52b9d6e05fe8ad6a0c7dab045291ac987
 //        this.monitoLog ( message.response_body.data );
 
         if ( message.status_code != Soup.Status.OK )
@@ -162,7 +156,7 @@ var GenericServer = class {
             {
                 // if error, grep for class='errorMessage'
                 // else grep for class='successBox'
-//                this.monitoLog ( 'Cmd output ' + _data );
+                this.monitoLog ( 'Cmd output ' + _data );
             }
         }
         catch ( e )

servers/icinga2api.js

@@ -85,7 +85,7 @@ var Icinga2API = class extends GenericServer {
 
     handlePollMessage ( _httpSession, message )
     {
-//        this.monitoLog ( 'handlePollMessage' );
+        this.monitoLog ( 'handlePollMessage' );
 
         let _data = super.handleMessage ( _httpSession, message );
         try