fix badge

deep-coder · Nov 8, 2016 · 0e6706d · 0e6706d
1 parent 98ddf90
commit 0e6706d
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Components/Widgets/Badge.js b/Components/Widgets/Badge.js
@@ -46,14 +46,9 @@ export default class BadgeNB extends NativeBaseComponent {
     }
     render() {
         return(
-<<<<<<< HEAD
             <View ref={c => this._root = c} {...this.prepareRootProps()}>
-                <Text style={{ color: (this.props.textStyle && this.props.textStyle.color) ? this.props.textStyle.color : this.getTheme().badgeColor,
-=======
-            <View {...this.prepareRootProps()}>
                 <Text style={[ this.props.textStyle, {
                                 color: (this.props.textStyle && this.props.textStyle.color) ? this.props.textStyle.color : this.getTheme().badgeColor,
->>>>>>> 8629392d4ad27c911011618f496c993296db2f67
                                 fontSize: (this.props.textStyle && this.props.textStyle.fontSize) ? this.props.textStyle.fontSize : this.getTheme().fontSizeBase,
                                 lineHeight: (this.props.textStyle && this.props.textStyle.lineHeight) ? this.props.textStyle.lineHeight : this.getTheme().lineHeight-1,
                                 textAlign: 'center'