fix conflict

cq0702 · Nov 30, 2018 · 04b00f0 · 04b00f0
2 parents f423853 + 02cde71
commit 04b00f0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -61,7 +61,6 @@ Basic usage
                     <SectionListContacts
                         ref={s=>this.sectionList=s}
                         sectionListData={this.state.dataArray}
-                        sectionHeight={50}
                         initialNumToRender={this.state.dataArray.length}
                         showsVerticalScrollIndicator={false}
                         SectionListClickCallback={(item,index)=>{