modify handling shift network source conflicts#2509

isabelfaulds wants to merge 1 commit into

google:maingoogle/heir:mainfrom

isabelfaulds:shift-networks-source-conflictsisabelfaulds/heir:shift-networks-source-conflictsCopy head branch name to clipboard