fix confict

This commit is contained in:
nixzhu
2015-05-07 15:28:54 +08:00
parent 6bb20c5592
commit 79dfb72601
+1 -1
View File
@@ -72,7 +72,7 @@
</connections>
</collectionView>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Q0w-sM-iIR" customClass="MessageToolbar" customModule="Yep" customModuleProvider="target">
<rect key="frame" x="0.0" y="396" width="600" height="44"/>
<rect key="frame" x="0.0" y="250" width="600" height="50"/>
<items/>
</toolbar>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g11-Ob-rEy" userLabel="More Message Types View">