You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@weex.apache.org by xiaohuapunk <gi...@git.apache.org> on 2018/04/25 13:57:56 UTC

[GitHub] incubator-weex pull request #1130: [WEEX-306][ios] resolve the naming confli...

GitHub user xiaohuapunk opened a pull request:

    https://github.com/apache/incubator-weex/pull/1130

    [WEEX-306][ios] resolve the naming conflicts  WXLogLevel

    [WEEX-306][ios] resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
    
    Note: Add the ‘#define WXLogLevel WeexLogLevel’ macro in the WXLog.h file and rename the WXLogLevel to WeexLogLevel to resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/xiaohuapunk/incubator-weex ios-WEEX-306-fix-WXLogLevel-Naming-Conflicts

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/incubator-weex/pull/1130.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1130
    
----
commit 32101169d4ff9dbe3549388c92739392420e9d4b
Author: xionghuayu <xi...@...>
Date:   2018-04-25T13:54:23Z

    [WEEX-306][ios] resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.
    
    Note: Add the ‘#define WXLogLevel WeexLogLevel’ macro in the WXLog.h file and rename the WXLogLevel to WeexLogLevel to resolve the naming conflicts between the WXLogLevel naming and the Wechat SDK.

----


---

[GitHub] incubator-weex issue #1130: [WEEX-306][ios] resolve the naming conflicts WXL...

Posted by acton393 <gi...@git.apache.org>.

Github user acton393 commented on the issue:

    https://github.com/apache/incubator-weex/pull/1130
  
    hi  @xiaohuapunk  thanks  for your contribution, it will be accepted, but you must pay more attention to your unnecessary file change, only commit the file you really update 


---

[GitHub] incubator-weex issue #1130: [WEEX-306][ios] resolve the naming conflicts WXL...

Posted by acton393 <gi...@git.apache.org>.

Github user acton393 commented on the issue:

    https://github.com/apache/incubator-weex/pull/1130
  
    @xiaohuapunk  thanks for your contribution, this pull request will be accepted and will be merged on.
    As we will rebase and squash the pull request, this pull request will be closed by robots  don't worry about it.


---

[GitHub] incubator-weex pull request #1130: [WEEX-306][ios] resolve the naming confli...

Posted by asfgit <gi...@git.apache.org>.

Github user asfgit closed the pull request at:

    https://github.com/apache/incubator-weex/pull/1130


---

[GitHub] incubator-weex issue #1130: [WEEX-306][ios] resolve the naming conflicts WXL...

Posted by weex-bot <gi...@git.apache.org>.

Github user weex-bot commented on the issue:

    https://github.com/apache/incubator-weex/pull/1130
  
    
    <!--
      0 failure: 
      1 warning:  No Changelog chan...
      1 messages
      
    -->
    
    
    <table>
      <thead>
        <tr>
          <th width="50"></th>
          <th width="100%" data-danger-table="true">Warnings</th>
        </tr>
      </thead>
      <tbody><tr>
          <td>:warning:</td>
          <td>No Changelog changes!</td>
        </tr>
      </tbody>
    </table>
    
    
    <table>
      <thead>
        <tr>
          <th width="50"></th>
          <th width="100%" data-danger-table="true">Messages</th>
        </tr>
      </thead>
      <tbody><tr>
          <td>:book:</td>
          <td>danger test finished.</td>
        </tr>
      </tbody>
    </table>
    
    
    <p align="right">
      Generated by :no_entry_sign: <a href="http://github.com/danger/danger-js/">dangerJS</a>
    </p>



---