royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [royale-asjs] 10/10: Missed this conflict
Date Sun, 02 Sep 2018 21:31:38 GMT
This is an automated email from the ASF dual-hosted git repository.

harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 4b322d53f4eef4baf805a1c683c6ac644ee946d1
Author: Harbs <harbs@in-tools.com>
AuthorDate: Mon Sep 3 00:27:45 2018 +0300

    Missed this conflict
---
 .../royale/net/remoting/messages/AcknowledgeMessageExt.as      | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
index 6573d47..3704c48 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
@@ -18,24 +18,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.net.remoting.messages
 {
-<<<<<<< HEAD
     import org.apache.royale.net.utils.IDataOutput;
     import org.apache.royale.net.utils.IExternalizable;
-=======
-    // import flash.utils.IDataOutput;
-    // import flash.utils.IExternalizable;
-    import org.apache.royale.net.utils.IDataOutput;
->>>>>>> feature/MXRoyale
 
     [RemoteClass(alias="DSK")]
     /**
      * @private
      */
-<<<<<<< HEAD
     public class AcknowledgeMessageExt extends AcknowledgeMessage implements IExternalizable
-=======
-    public class AcknowledgeMessageExt extends AcknowledgeMessage// implements IExternalizable
->>>>>>> feature/MXRoyale
     {
         //--------------------------------------------------------------------------
         //


Mime
View raw message