Fixed merge conflict.

Author: AMorporkian

packets/data_types.py

@@ -70,7 +70,6 @@ def _encode(self, obj, context):
     def _decode(self, obj, context):
         return obj.string
 
-
 class Joiner(Adapter):
     def _encode(self, obj, context):
         return obj
@@ -84,13 +83,11 @@ def _decode(self, obj, context):
                                                        String("string", lambda ctx: ctx.length)
 )
 
-
 class VariantVariant(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
         return [Variant("").parse_stream(stream) for _ in range(l)]
 
-
 class DictVariant(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)
@@ -120,7 +117,6 @@ def _parse(self, stream, context):
         elif x == 7:
             return DictVariant("").parse_stream(stream)
 
-
 class StarByteArray(Construct):
     def _parse(self, stream, context):
         l = VLQ("").parse_stream(stream)

plugins/core/admin_commands_plugin/admin_command_plugin.py

@@ -62,12 +62,20 @@ def promote(self, data):
             self.logger.trace("Player object in promote command, found by name, is %s." % str(player))
             if player is not None:
                 self.logger.trace("Player object was not None. Dump of player object follows.")
+<<<<<<< HEAD
                 for line in pprint.pformat(player).split("\n"):
                     self.logger.trace("\t" + line)
                 old_rank = player.access_level
                 if old_rank >= self.protocol.player.access_level:
                     self.logger.trace(
                         "The old rank was greater or equal to the current rank. Sending a message and returning.")
+=======
+                for line in pprint.pformat(player):
+                    self.logger.trace("\t"+line)
+                old_rank = player.access_level
+                if old_rank >= self.protocol.player.access_level:
+                    self.logger.trace("The old rank was greater or equal to the current rank. Sending a message and returning.")
+>>>>>>> 2e8bda81d627d13dfb3f4c4f329bd1b2417d3fde
                     self.protocol.send_chat_message(
                         "You cannot change that user's access level as they are at least at an equal level as you.")
                     return