Fixing conflict.

test/services/queue/queueservice-tests.js

@@ -391,12 +391,8 @@ suite('queueservice-tests', function () {
               assert.notEqual(messages, null);
               if (messages) {
                 // By default only one is returned
-<<<<<<< HEAD
                 assert.equal(messages.length, 1);
-=======
-                test.equal(messages.length, 1);
-                test.equal(messages[0].messagetext, 'msg1');
->>>>>>> upstream/dev
+                assert.equal(messages[0].messagetext, 'msg1');
               }
 
               queueService.getMessages(queueName, { numofmessages: 2 }, function (error4, messages2) {