Merge branch 'master' of https://github.com/coryalder/W4D5-Conflicts

lhl-cory · Jul 3, 2015 · 5cc5f0d · 5cc5f0d
2 parents b8dd117 + d6744c9
commit 5cc5f0d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Conflicts/Base.lproj/Main.storyboard b/Conflicts/Base.lproj/Main.storyboard
@@ -155,15 +155,15 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mBK-gY-ekK">
-                                <rect key="frame" x="279" y="290" width="42" height="21"/>
+                                <rect key="frame" x="279" y="289" width="42" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstAttribute="centerY" secondItem="mBK-gY-ekK" secondAttribute="centerY" id="Gzo-Tb-XHE"/>
+                            <constraint firstAttribute="centerY" secondItem="mBK-gY-ekK" secondAttribute="centerY" constant="1" id="Gzo-Tb-XHE"/>
                             <constraint firstAttribute="centerX" secondItem="mBK-gY-ekK" secondAttribute="centerX" id="vQg-yi-T4q"/>
                         </constraints>
                     </view>

diff --git a/Conflicts/DetailViewController.m b/Conflicts/DetailViewController.m
@@ -19,7 +19,10 @@ @implementation DetailViewController
 - (void)setDetailItem:(id)newDetailItem {
     if (_detailItem != newDetailItem) {
         _detailItem = newDetailItem;
-
+
+
+
+        NSLog(@"This is a change on the second conflict clone");
         // Update the view.
         [self configureView];
     }