Conflict resolution

Author: OtterCode

lib/winston-loggly.js

@@ -141,7 +141,11 @@ Loggly.prototype.log = function (level, msg, meta, callback) {
     callback(err, true);
   }
 
+<<<<<<< HEAD
   return (meta && meta.tags)
+=======
+  return meta && meta.tags
+>>>>>>> 0feed30d2ec0acd6f6d7260aca6b6de71ca50c76
     ? this.client.log(message, meta.tags, logged)
     : this.client.log(message, logged);
 };