After reverting the merge I merged my backup with the reverted project. Now the changes I committed before the "bad" merging are back. Changes are: added some roboto fonts changed username label and message label color and font added nsdateformatter in view controller and formatted timestamp fixed layout for timestamp and username (now the are close next to each other) removed tableview and backToMainView action from right view
After reverting the merge I merged my backup with the reverted project. Now the changes I committed before the "bad" merging are back.
Changes are:
added some roboto fonts
changed username label and message label color and font
added nsdateformatter in view controller and formatted timestamp
fixed layout for timestamp and username (now the are close next to each other)
removed tableview and backToMainView action from right view

kormic/Rocket.Chat.iOS,kormic/Rocket.Chat.iOS