Pb during Merge branch 'Mixpanel' into develop

# Conflicts: # entourage/Assets/Storyboards/ActiveFeedItem.storyboard
ReseauEntourage · Oct 12, 2017 · 1c2cd87 · 1c2cd87
1 parent 93dc449
commit 1c2cd87
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/entourage/Assets/Storyboards/ActiveFeedItem.storyboard b/entourage/Assets/Storyboards/ActiveFeedItem.storyboard
@@ -502,21 +502,13 @@
                                                                     </userDefinedRuntimeAttributes>
                                                                 </imageView>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="R7L-pV-Coz">
-<<<<<<< HEAD
                                                                     <rect key="frame" x="101.33333333333334" y="90" width="73" height="18"/>
-=======
-                                                                    <rect key="frame" x="101" y="90" width="73" height="18"/>
->>>>>>> Mixpanel
                                                                     <fontDescription key="fontDescription" name="SFUIText-Medium" family="SF UI Text" pointSize="15"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="veut rejoindre votre maraude." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="gDf-jH-qfI">
-<<<<<<< HEAD
                                                                     <rect key="frame" x="39" y="108" width="196.33333333333331" height="18"/>
-=======
-                                                                    <rect key="frame" x="39.666666666666657" y="108" width="196.33333333333331" height="18"/>
->>>>>>> Mixpanel
                                                                     <fontDescription key="fontDescription" name="SFUIText-Light" family="SF UI Text" pointSize="15"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -703,21 +695,13 @@
                                                                     </userDefinedRuntimeAttributes>
                                                                 </imageView>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="User name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gES-5W-eoJ">
-<<<<<<< HEAD
                                                                     <rect key="frame" x="101.33333333333334" y="90" width="73" height="18"/>
-=======
-                                                                    <rect key="frame" x="101" y="90" width="73" height="18"/>
->>>>>>> Mixpanel
                                                                     <fontDescription key="fontDescription" name="SFUIText-Medium" family="SF UI Text" pointSize="15"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="veut rejoindre votre maraude." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="npE-Su-q4O">
-<<<<<<< HEAD
                                                                     <rect key="frame" x="39" y="108" width="196.33333333333331" height="18"/>
-=======
-                                                                    <rect key="frame" x="39.666666666666657" y="108" width="196.33333333333331" height="18"/>
->>>>>>> Mixpanel
                                                                     <fontDescription key="fontDescription" name="SFUIText-Light" family="SF UI Text" pointSize="15"/>
                                                                     <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     <nil key="highlightedColor"/>
@@ -826,11 +810,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MZn-9Q-IvZ">
-<<<<<<< HEAD
                                                     <rect key="frame" x="192.33333333333334" y="7" width="30" height="30"/>
-=======
-                                                    <rect key="frame" x="185" y="7" width="46" height="30"/>
->>>>>>> Mixpanel
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="30" id="XSO-ha-Vz1"/>