ylecollen
dbkrAuto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
Auto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
Auto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
Auto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
Auto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
Auto-merging matrix-sdk/src/main/res/values-ru/strings.xml Auto-merging matrix-sdk/src/main/res/values-es/strings.xml Auto-merging matrix-sdk/src/main/res/values-es-rMX/strings.xml Auto-merging matrix-sdk/src/main/res/values-de/strings.xml CONFLICT (content): Merge conflict in matrix-sdk/src/main/res/values-de/strings.xml Removing matrix-sdk/src/main/res/layout/unread_messages_footer.xml Removing matrix-sdk/src/main/res/layout/receipt_round_avatar.xml Removing matrix-sdk/src/main/res/layout/message_timestamp.xml Removing matrix-sdk/src/main/res/layout/message_separator.xml Removing matrix-sdk/src/main/res/layout/message_sender.xml Removing matrix-sdk/src/main/res/layout/message_read_marker.xml Removing matrix-sdk/src/main/res/layout/message_header.xml Removing matrix-sdk/src/main/res/layout/adapter_room_section_header.xml Removing matrix-sdk/src/main/res/layout/adapter_item_waiting_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_room_members.xml Removing matrix-sdk/src/main/res/layout/adapter_item_my_rooms.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_text_emote_notice.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_image_video.xml Removing matrix-sdk/src/main/res/layout/adapter_item_message_file.xml Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomSummaryAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/RoomMembersAdapter.java Removing matrix-sdk/src/main/java/org/matrix/androidsdk/adapters/MessagesAdapter.java Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago
None