# Conflicts: # android/app/build.gradle # app/views/RoomsListView/Header/Header.ios.js |
||
---|---|---|
.. | ||
Images.xcassets | ||
AppDelegate.h | ||
AppDelegate.m | ||
Info.plist | ||
RocketChatRN.entitlements | ||
main.m |
# Conflicts: # android/app/build.gradle # app/views/RoomsListView/Header/Header.ios.js |
||
---|---|---|
.. | ||
Images.xcassets | ||
AppDelegate.h | ||
AppDelegate.m | ||
Info.plist | ||
RocketChatRN.entitlements | ||
main.m |