Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix naming conflict with YYText #trivial #623

Merged
merged 1 commit into from
Oct 18, 2017
Merged

Conversation

maicki
Copy link
Contributor

@maicki maicki commented Oct 18, 2017

Fixes #458

@maicki maicki requested a review from nguyenhuy October 18, 2017 17:36
@ghost
Copy link

ghost commented Oct 18, 2017

1 Warning
⚠️ Please ensure license is correct for ASTextDebugOption.m:

//
//  ASTextDebugOption.m
//  Texture
//
//  Copyright (c) 2014-present, Facebook, Inc.  All rights reserved.
//  This source code is licensed under the BSD-style license found in the
//  LICENSE file in the /ASDK-Licenses directory of this source tree. An additional
//  grant of patent rights can be found in the PATENTS file in the same directory.
//
//  Modifications to this file made after 4/13/2017 are: Copyright (c) 2017-present,
//  Pinterest, Inc.  Licensed under the Apache License, Version 2.0 (the "License");
//  you may not use this file except in compliance with the License.
//  You may obtain a copy of the License at
//
//      http://www.apache.org/licenses/LICENSE-2.0
//

    

Generated by 🚫 Danger

@appleguy appleguy merged commit 526a7cf into master Oct 18, 2017
@appleguy appleguy deleted the MSFixYYTextFuncNameClash branch October 18, 2017 22:50
bernieperez pushed a commit to AtomTickets/Texture that referenced this pull request Apr 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants