# Conflicts:
# js/common/PTR/lib/ControlledRefreshableListView.js
# js/common/PTR/lib/RefreshableListView.js
# js/common/PTR/lib/RefreshingIndicator.js
# js/common/components/ImagesAsGif.js
# js/common/components/YH_ViewPager.android.js
# js/common/components/customComponents/android_0.35/ScrollView.js.bak
# js/common/components/customComponents/android_0.49.5/ListView.js.bak
# js/common/components/customComponents/android_0.49.5/ScrollView.js.bak
# js/common/components/customComponents/android_0.49.5/SectionList.js.bak
# js/common/components/customComponents/android_0.49.5/TouchableHighlight.js.bak
# js/common/components/customComponents/android_0.49.5/TouchableOpacity.js.bak
# js/common/components/customComponents/android_0.49.5/View.js.bak
# js/common/components/customComponents/android_0.49.5/ViewPropTypes.js.bak
# js/common/components/customComponents/android_0.49.5/VirtualizedSectionList.js.bak
# js/common/react-native-scrollable-tab-view/DefaultTabBar.js
# js/common/react-native-scrollable-tab-view/ScrollableTabBar.js
# js/common/react-native-scrollable-tab-view/index.js
# js/common/recycler-swiper/src/index.js
# js/community/components/home/Home.js
# js/community/components/home/NumberButton.js
# js/community/components/home/SectionItem.js
# js/community/components/home/UploadProgress.js
# js/community/components/home/UserBrief.js
# js/community/components/home/YH_SectionView.js
# js/community/components/message/MessageCenter.js
# js/community/components/message/MsgCenterCatgoryCell.js
# js/community/components/message/MsgCenterNormalCell.js
# js/community/components/message/SysMsgCell.js
# js/community/components/message/SystemMessage.js
# js/community/components/section/Section.js
# js/community/components/section/SectionHeader.js
# js/community/components/user/UserCenterTop.js
# js/coupon/components/common/BannerView.js
# js/goodGoodsRecommend/components/detail/GoodGoodsImagesView.js
# js/guang/components/detail/CommentsTitle.js
# js/newArrival/components/newArrival/FeaturedView.js
# js/plustar/components/common/BannerView.js
# js/qrcode/components/common/BannerView.js
# js/search/components/common/BannerView.js
# js/studentCertification/components/common/BannerView.js
# package.json
