Skip to content

Instantly share code, notes, and snippets.

@wardbekker

wardbekker/storyboard.diff

Created April 2, 2013 18:32
Show Gist options
  • Save wardbekker/5294874 to your computer and use it in GitHub Desktop.
Save wardbekker/5294874 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
storyboard.diff
diff --cc BirdWatching/en.lproj/MainStoryboard_iPhone.storyboard
index b30e040,8f7c8ae..0000000
--- a/BirdWatching/en.lproj/MainStoryboard_iPhone.storyboard
+++ b/BirdWatching/en.lproj/MainStoryboard_iPhone.storyboard
@@@ -95,14 -95,28 +95,36 @@@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Bird Name" textAlignment="right" lineBr
++<<<<<<< HEAD
+ <rect key="frame" x="157" y="11" width="135" height="21"/>
++=======
+ <rect key="frame" x="155" y="11" width="135" height="21"/>
++>>>>>>> changes
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" lineBreakMode="tailTruncation" m
++<<<<<<< HEAD
+ <rect key="frame" x="179" y="11" width="135" height="21"/>
++=======
+ <rect key="frame" x="93" y="11" width="135" height="21"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" lineBreakMode="tailTruncation" m
+ <rect key="frame" x="12" y="11" width="135" height="21"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+ <nil key="highlightedColor"/>
+ </label>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Label" lineBreakMode="tailTruncation" m
+ <rect key="frame" x="146" y="20" width="135" height="21"/>
++>>>>>>> changes
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
@@@ -174,7 -188,7 +196,11 @@@
</connections>
</tableView>
<toolbarItems>
++<<<<<<< HEAD
+ <barButtonItem style="done" systemItem="add" id="ubO-tb-MZc"/>
++=======
+ <barButtonItem style="plain" systemItem="add" id="mCU-VI-N6C"/>
++>>>>>>> changes
</toolbarItems>
<navigationItem key="navigationItem" id="KmI-ni-9bs"/>
<simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
@@@ -292,12 -278,12 +318,16 @@@
</connections>
</tableView>
<navigationItem key="navigationItem" id="R0j-xR-4Ve">
++<<<<<<< HEAD
+ <barButtonItem key="leftBarButtonItem" style="plain" systemItem="cancel" id="dmB-S2-UHF">
++=======
+ <barButtonItem key="leftBarButtonItem" style="plain" systemItem="action" id="u3Y-KO-Qek">
++>>>>>>> changes
<connections>
- <action selector="cancel:" destination="enC-Ke-XaP" id="LrM-zV-D1q"/>
+ <action selector="cancel:" destination="enC-Ke-XaP" id="re9-YD-TFa"/>
</connections>
</barButtonItem>
- <barButtonItem key="rightBarButtonItem" style="plain" systemItem="done" id="DRi-Iq-y6l">
+ <barButtonItem key="rightBarButtonItem" style="plain" systemItem="fastForward" id="DRi-Iq-y6l">
<connections>
<action selector="done:" destination="enC-Ke-XaP" id="zna-10-Oyb"/>
</connections>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment