# Conflicts: # app/views/ChangeAvatarView/index.tsx # app/views/RoomsListView/Header/Header.tsx # ios/RocketChatRN.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
Header | ||
ListHeader | ||
ServerDropdown.tsx | ||
index.tsx | ||
styles.ts |
# Conflicts: # app/views/ChangeAvatarView/index.tsx # app/views/RoomsListView/Header/Header.tsx # ios/RocketChatRN.xcodeproj/project.pbxproj |
||
---|---|---|
.. | ||
Header | ||
ListHeader | ||
ServerDropdown.tsx | ||
index.tsx | ||
styles.ts |