From 814821d067c56351c467a64fa2606a3c0ecb7206 Mon Sep 17 00:00:00 2001
From: Emmett Raymond <emmettaraymond@gmail.com>
Date: Mon, 25 Jun 2018 13:49:09 -0600
Subject: [PATCH] Small fixes.

---
 lib/winston-loggly.js | 4 ----
 test/helpers.js       | 9 +++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/winston-loggly.js b/lib/winston-loggly.js
index a1c20c2..cf08e02 100755
--- a/lib/winston-loggly.js
+++ b/lib/winston-loggly.js
@@ -141,11 +141,7 @@ 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);
 };
diff --git a/test/helpers.js b/test/helpers.js
index 7925751..292c041 100644
--- a/test/helpers.js
+++ b/test/helpers.js
@@ -32,6 +32,15 @@ module.exports.testLevels = function (transport, assertMsg, assertFn) {
   primmetadatatest[assertMsg] = assertFn;
   tests['when passed primitive metadata'] = primmetadatatest;
 
+  var nummetadatatest = {
+    topic: function () {
+      transport.log('info', 'test message', 123456789, this.callback.bind(this, null));
+    }
+  };
+
+  nummetadatatest[assertMsg] = assertFn;
+  tests['when passed numeric metadata'] = nummetadatatest;
+
 // circular references aren't supportded by regular JSON, and it's not supported
 // by node-loggly-bulk. I'm omitting it for now. If it wants to be fixed, then
 // node-loggly-bulk needs an update.