forked from chromium/chromium
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[ios] Fix instance method conflicts in Showcase.
Showcase's protocol_alerter.mm is conflicting with OCMock. Prefixing with crsc_ instead. Bug: 988423 Change-Id: I542b7df1374a285b3a8ecf293b682fa922d10fde Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724654 Commit-Queue: Justin Cohen <justincohen@chromium.org> Auto-Submit: Justin Cohen <justincohen@chromium.org> Reviewed-by: Rohit Rao <rohitrao@chromium.org> Cr-Commit-Position: refs/heads/master@{#681816}
- Loading branch information
Justin Cohen
authored and
Commit Bot
committed
Jul 29, 2019
1 parent
a7ab293
commit dd41c58
Showing
1 changed file
with
9 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters