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 <xionghuayu@...>
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.

----


---

Reply via email to