Skip to content

Instantly share code, notes, and snippets.

@neilinglis
Created September 16, 2014 08:55
Show Gist options
  • Save neilinglis/e238d5f22f85fa259ade to your computer and use it in GitHub Desktop.
Save neilinglis/e238d5f22f85fa259ade to your computer and use it in GitHub Desktop.
Storyboard Merge Conflict. Is there any sensible course of action for this?
<<<<<<< HEAD
<segue reference="kXa-Mw-CAj"/>
<segue reference="TDo-lS-nUS"/>
<segue reference="hJU-8t-Kde"/>
<segue reference="haI-hu-Unh"/>
<segue reference="2ra-9a-RvO"/>
<segue reference="ixW-dA-JnA"/>
=======
<segue reference="BwM-Nh-uZ9"/>
<segue reference="YWK-Ch-lfU"/>
<segue reference="haI-hu-Unh"/>
<segue reference="TDo-lS-nUS"/>
<segue reference="hJU-8t-Kde"/>
<segue reference="y7Z-qu-r0P"/>
>>>>>>> e9a57872e96f17a8d2d785e4de0132e75229a262
@david-hoze
Copy link

david-hoze commented Aug 8, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment