You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Provides narrower regex for conflict marker detect#495
Merged
segiddins merged 2 commits intoCocoaPods:masterCocoaPods/Xcodeproj:masterfrom allenhumphreys:fix-overeager-conflictmatchingCopy head branch name to clipboardJun 23, 2017
Allen Humphreys