Component Translated Untranslated Untranslated words Untranslated characters Checks Suggestions Comments
Android app Fix this component to clear its alerts. GPL-3.0 0 0 0 58 5 1
iOS app Fix this component to clear its alerts. This translation is locked. GPL-3.0 79% 180 1,326 8,569 10 0 0
Glossary TOK Fix this component to clear its alerts. GPL-3.0 0 0 0 0 0 0

Overview

Project website www.tok.life
Project maintainers User avatar tokinsight
Translation license GPL-3.0 Android app iOS app TOK

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 2,384 12,916 82,203
Source 427 2,373 15,127
Translated 92% 2,204 89% 11,590 89% 73,634
Needs editing 0% 0 0% 0 0% 0
Failing checks 2% 68 4% 526 4% 3,821
Strings with suggestions 1% 5 1% 20 1% 105
Not translated strings 7% 180 10% 1,326 10% 8,569

Quick numbers

12,916
Hosted words
2,384
Hosted strings
92%
Translated
0
Contributors
and previous 30 days

Trends of last 30 days

Hosted words
Hosted strings
Translated
Contributors
Language Translated Untranslated Untranslated words Untranslated characters Checks Suggestions Comments
English This translation is used for source strings. Some of the components within this project have alerts. 0 0 0 13 0 1
Catalan Some of the components within this project have alerts. 99% 2 4 24 5 0 0
Chinese (Simplified) Some of the components within this project have alerts. 0 0 0 21 5 0
French Some of the components within this project have alerts. 0 0 0 4 0 0
Polish Some of the components within this project have alerts. 178 strings are not being translated here. 0 0 0 2 0 0
Spanish Some of the components within this project have alerts. 58% 178 1,322 8,545 23 0 0
User avatar None

New alert

TOK / TOK

No mask matches. 7 months ago
User avatar None

New alert

TOK / TOK

Broken project website URL 7 months ago
User avatar None

Failed rebase on repository

TOK / iOS app

First, rewinding head to replay your work on top of it...
Applying: feat:Init commit
.git/rebase-apply/patch:757: trailing whitespace.
  
.git/rebase-apply/patch:763: trailing whitespace.
  
.git/rebase-apply/patch:927: trailing whitespace.
# Tok iOS
.git/rebase-apply/patch:928: trailing whitespace.

.git/rebase-apply/patch:929: trailing whitespace.
> Make the world connect freely!
warning: squelched 24848 whitespace errors
warning: 24853 lines add whitespace errors.
warning: Cannot merge binary files: Tok/Assets.xcassets/Me/About.imageset/about@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Me/About.imageset/about@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png (HEAD vs. feat:Init commit)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging TokTests/Info.plist
CONFLICT (add/add): Merge conflict in TokTests/Info.plist
Auto-merging Tok/Tok-Bridging-Header.h
CONFLICT (add/add): Merge conflict in Tok/Tok-Bridging-Header.h
Auto-merging Tok/Support Files/Localizable Files/zh-Hans.lproj/Localizable.strings
CONFLICT (add/add): Merge conflict in Tok/Support Files/Localizable Files/zh-Hans.lproj/Localizable.strings
Auto-merging Tok/Support Files/Localizable Files/en.lproj/Localizable.strings
CONFLICT (add/add): Merge conflict in Tok/Support Files/Localizable Files/en.lproj/Localizable.strings
Auto-merging Tok/Support Files/Info.plist
CONFLICT (add/add): Merge conflict in Tok/Support Files/Info.plist
Auto-merging Tok/Services/UserService.swift
CONFLICT (add/add): Merge conflict in Tok/Services/UserService.swift
Auto-merging Tok/Services/NotificationManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/NotificationManager.swift
Auto-merging Tok/Services/FriendService.swift
CONFLICT (add/add): Merge conflict in Tok/Services/FriendService.swift
Auto-merging Tok/Services/CallManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/CallManager.swift
Auto-merging Tok/Services/AvatarManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/AvatarManager.swift
Auto-merging Tok/Services/AlertAudioPlayer.swift
CONFLICT (add/add): Merge conflict in Tok/Services/AlertAudioPlayer.swift
Auto-merging Tok/Scenes/WebViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/WebViewController.swift
Auto-merging Tok/Scenes/Views/UserStatusView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/UserStatusView.swift
Auto-merging Tok/Scenes/Views/ProgressHUD.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/ProgressHUD.swift
Auto-merging Tok/Scenes/Views/AlertView/AlertViewManager.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/AlertView/AlertViewManager.swift
Auto-merging Tok/Scenes/Views/AlertView/AlertMessageView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/AlertView/AlertMessageView.swift
Auto-merging Tok/Scenes/Me/Views/SingleLineCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/SingleLineCell.swift
Auto-merging Tok/Scenes/Me/Views/SettingsCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/SettingsCell.swift
Auto-merging Tok/Scenes/Me/Views/ProfileCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/ProfileCell.swift
Auto-merging Tok/Scenes/Me/Views/PortraitCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/PortraitCell.swift
Auto-merging Tok/Scenes/Me/Views/BotPortraitCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/BotPortraitCell.swift
Auto-merging Tok/Scenes/Me/SettingsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/SettingsViewController.swift
Auto-merging Tok/Scenes/Me/SetPasswordViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/SetPasswordViewController.swift
Auto-merging Tok/Scenes/Me/ProfileViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/ProfileViewController.swift
Auto-merging Tok/Scenes/Me/ProfilePhotoViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/ProfilePhotoViewController.swift
Auto-merging Tok/Scenes/Me/MeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/MeViewController.swift
Auto-merging Tok/Scenes/Me/AboutViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/AboutViewController.swift
Auto-merging Tok/Scenes/HomeViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/HomeViewModel.swift
Auto-merging Tok/Scenes/HomeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/HomeViewController.swift
Auto-merging Tok/Scenes/Conversation/Views/ConversationTitleView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Views/ConversationTitleView.swift
Auto-merging Tok/Scenes/Conversation/Models/MessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/MessageModel.swift
Auto-merging Tok/Scenes/Conversation/Models/MediaModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/MediaModel.swift
Auto-merging Tok/Scenes/Conversation/Models/FileMessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/FileMessageModel.swift
Auto-merging Tok/Scenes/Conversation/Models/AudioMessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/AudioMessageModel.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Protocols/MediaItem.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Protocols/MediaItem.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKitDateFormatter.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKitDateFormatter.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKind.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKind.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/DetectorType.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/DetectorType.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Layout/SystemMessageSizeCalculator.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Layout/SystemMessageSizeCalculator.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Layout/MessagesCollectionViewFlowLayout.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Layout/MessagesCollectionViewFlowLayout.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Controllers/MessagesViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Controllers/MessagesViewController.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/VideoMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/VideoMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/TipMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/TipMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/PhotoMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/PhotoMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/OperationMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/OperationMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/FileMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/FileMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/AudioMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/AudioMessageCell.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/UIScrollView+ChatAdditions.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/UIScrollView+ChatAdditions.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/ChatShareMoreView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/ChatShareMoreView.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/AudioInputButton.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/AudioInputButton.swift
Auto-merging Tok/Scenes/Conversation/ForwardMessageViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ForwardMessageViewModel.swift
Auto-merging Tok/Scenes/Conversation/ForwardChatViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ForwardChatViewController.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController+Subviews.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController+Subviews.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController+InputBar.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController+InputBar.swift
Auto-merging Tok/Scenes/Conversation/ConversationDataSource.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationDataSource.swift
Auto-merging Tok/Scenes/Conversation/ConversationCollectionViewFlowLayout.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationCollectionViewFlowLayout.swift
Auto-merging Tok/Scenes/Conversation/Camera/VideoPreviewViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Camera/VideoPreviewViewController.swift
Auto-merging Tok/Scenes/Conversation/Camera/CameraViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Camera/CameraViewController.swift
Auto-merging Tok/Scenes/Contracts/Views/RSKPlaceholderTextView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/RSKPlaceholderTextView.swift
Auto-merging Tok/Scenes/Contracts/Views/FriendInfoCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/FriendInfoCell.swift
Auto-merging Tok/Scenes/Contracts/Views/ContractMenuCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/ContractMenuCell.swift
Auto-merging Tok/Scenes/Contracts/Views/ContractDetailCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/ContractDetailCell.swift
Auto-merging Tok/Scenes/Contracts/QRViewerController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/QRViewerController.swift
Auto-merging Tok/Scenes/Contracts/QRScannerController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/QRScannerController.swift
Auto-merging Tok/Scenes/Contracts/InviteFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/InviteFriendViewController.swift
Auto-merging Tok/Scenes/Contracts/InvitationsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/InvitationsViewController.swift
Auto-merging Tok/Scenes/Contracts/FriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/FriendViewController.swift
Auto-merging Tok/Scenes/Contracts/ContactsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/ContactsViewController.swift
Auto-merging Tok/Scenes/Contracts/AddFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/AddFriendViewController.swift
Auto-merging Tok/Scenes/Choose/Views/SearchFriendsView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Views/SearchFriendsView.swift
Auto-merging Tok/Scenes/Choose/ChooseFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/ChooseFriendViewController.swift
Auto-merging Tok/Scenes/Choose/Cells/FriendSelectionViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Cells/FriendSelectionViewModel.swift
Auto-merging Tok/Scenes/Choose/Cells/FriendSelectionCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Cells/FriendSelectionCell.swift
Auto-merging Tok/Scenes/Chats/Views/ChatsCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Chats/Views/ChatsCell.swift
Auto-merging Tok/Scenes/Chats/ChatsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Chats/ChatsViewController.swift
Auto-merging Tok/Scenes/Call/Views/CallButton.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/Views/CallButton.swift
Auto-merging Tok/Scenes/Call/CallIncomingController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallIncomingController.swift
Auto-merging Tok/Scenes/Call/CallBaseController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallBaseController.swift
Auto-merging Tok/Scenes/Call/CallActiveController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallActiveController.swift
Auto-merging Tok/Scenes/BaseViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/BaseViewController.swift
Auto-merging Tok/Scenes/Auth/WelcomeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/WelcomeViewController.swift
Auto-merging Tok/Scenes/Auth/RegisterViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/RegisterViewController.swift
Auto-merging Tok/Scenes/Auth/LoginViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/LoginViewController.swift
Auto-merging Tok/Extensions/URLExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/URLExtension.swift
Auto-merging Tok/Extensions/UIViewExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIViewExtension.swift
Auto-merging Tok/Extensions/UIViewControllerExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIViewControllerExtension.swift
Auto-merging Tok/Extensions/UIImageExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImageExtension.swift
Auto-merging Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.m
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.m
Auto-merging Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.h
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.h
Auto-merging Tok/Extensions/UIColorExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIColorExtension.swift
Auto-merging Tok/Extensions/UIButtonExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIButtonExtension.swift
Auto-merging Tok/Extensions/UIApplicationExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIApplicationExtension.swift
Auto-merging Tok/Extensions/StringExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/StringExtension.swift
Auto-merging Tok/Extensions/OCTSubmanagerObjectsExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/OCTSubmanagerObjectsExtension.swift
Auto-merging Tok/Extensions/OCTManagerConfigurationExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/OCTManagerConfigurationExtension.swift
Auto-merging Tok/Extensions/DataExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/DataExtension.swift
Auto-merging Tok/Core/toxcore/toxcore/util_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util_test.cc
Auto-merging Tok/Core/toxcore/toxcore/util.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util.h
Auto-merging Tok/Core/toxcore/toxcore/util.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util.c
Auto-merging Tok/Core/toxcore/toxcore/tox_api.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox_api.c
Auto-merging Tok/Core/toxcore/toxcore/tox.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.h
Auto-merging Tok/Core/toxcore/toxcore/tox.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.c
Auto-merging Tok/Core/toxcore/toxcore/tox.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.api.h
Auto-merging Tok/Core/toxcore/toxcore/state.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/state.h
Auto-merging Tok/Core/toxcore/toxcore/state.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/state.c
Auto-merging Tok/Core/toxcore/toxcore/ping_array_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array_test.cc
Auto-merging Tok/Core/toxcore/toxcore/ping_array.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.h
Auto-merging Tok/Core/toxcore/toxcore/ping_array.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.c
Auto-merging Tok/Core/toxcore/toxcore/ping_array.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.api.h
Auto-merging Tok/Core/toxcore/toxcore/ping.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.h
Auto-merging Tok/Core/toxcore/toxcore/ping.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.c
Auto-merging Tok/Core/toxcore/toxcore/ping.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.api.h
Auto-merging Tok/Core/toxcore/toxcore/onion_client.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_client.h
Auto-merging Tok/Core/toxcore/toxcore/onion_client.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_client.c
Auto-merging Tok/Core/toxcore/toxcore/onion_announce.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_announce.h
Auto-merging Tok/Core/toxcore/toxcore/onion_announce.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_announce.c
Auto-merging Tok/Core/toxcore/toxcore/onion.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion.h
Auto-merging Tok/Core/toxcore/toxcore/onion.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion.c
Auto-merging Tok/Core/toxcore/toxcore/network.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/network.h
Auto-merging Tok/Core/toxcore/toxcore/network.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/network.c
Auto-merging Tok/Core/toxcore/toxcore/net_crypto.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/net_crypto.h
Auto-merging Tok/Core/toxcore/toxcore/net_crypto.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/net_crypto.c
Auto-merging Tok/Core/toxcore/toxcore/mono_time_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time_test.cc
Auto-merging Tok/Core/toxcore/toxcore/mono_time.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time.h
Auto-merging Tok/Core/toxcore/toxcore/mono_time.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time.c
Auto-merging Tok/Core/toxcore/toxcore/logger.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/logger.h
Auto-merging Tok/Core/toxcore/toxcore/logger.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/logger.c
Auto-merging Tok/Core/toxcore/toxcore/list.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/list.h
Auto-merging Tok/Core/toxcore/toxcore/list.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/list.c
Auto-merging Tok/Core/toxcore/toxcore/group.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/group.h
Auto-merging Tok/Core/toxcore/toxcore/group.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/group.c
Auto-merging Tok/Core/toxcore/toxcore/friend_requests.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_requests.h
Auto-merging Tok/Core/toxcore/toxcore/friend_requests.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_requests.c
Auto-merging Tok/Core/toxcore/toxcore/friend_connection.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_connection.h
Auto-merging Tok/Core/toxcore/toxcore/friend_connection.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_connection.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core_test.cc
Auto-merging Tok/Core/toxcore/toxcore/crypto_core_mem.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core_mem.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.h
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.api.h
Auto-merging Tok/Core/toxcore/toxcore/ccompat.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ccompat.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_server.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_server.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_server.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_server.c
Auto-merging Tok/Core/toxcore/toxcore/TCP_connection.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_connection.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_connection.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_connection.c
Auto-merging Tok/Core/toxcore/toxcore/TCP_client.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_client.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_client.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_client.c
Auto-merging Tok/Core/toxcore/toxcore/Messenger.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Messenger.h
Auto-merging Tok/Core/toxcore/toxcore/Messenger.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Messenger.c
Auto-merging Tok/Core/toxcore/toxcore/Makefile.inc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Makefile.inc
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.h
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.c
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.api.h
Auto-merging Tok/Core/toxcore/toxcore/DHT.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/DHT.h
Auto-merging Tok/Core/toxcore/toxcore/DHT.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/DHT.c
Auto-merging Tok/Core/toxcore/toxcore/BUILD.bazel
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/BUILD.bazel
Auto-merging Tok/Core/toxcore/toxav/video.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/video.h
Auto-merging Tok/Core/toxcore/toxav/video.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/video.c
Auto-merging Tok/Core/toxcore/toxav/toxav_old.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav_old.c
Auto-merging Tok/Core/toxcore/toxav/toxav.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.h
Auto-merging Tok/Core/toxcore/toxav/toxav.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.c
Auto-merging Tok/Core/toxcore/toxav/toxav.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.api.h
Auto-merging Tok/Core/toxcore/toxav/rtp_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp_test.cc
Auto-merging Tok/Core/toxcore/toxav/rtp.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp.h
Auto-merging Tok/Core/toxcore/toxav/rtp.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp.c
Auto-merging Tok/Core/toxcore/toxav/ring_buffer_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer_test.cc
Auto-merging Tok/Core/toxcore/toxav/ring_buffer.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer.h
Auto-merging Tok/Core/toxcore/toxav/ring_buffer.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer.c
Auto-merging Tok/Core/toxcore/toxav/msi.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/msi.h
Auto-merging Tok/Core/toxcore/toxav/msi.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/msi.c
Auto-merging Tok/Core/toxcore/toxav/groupav.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/groupav.h
Auto-merging Tok/Core/toxcore/toxav/groupav.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/groupav.c
Auto-merging Tok/Core/toxcore/toxav/bwcontroller.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/bwcontroller.h
Auto-merging Tok/Core/toxcore/toxav/bwcontroller.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/bwcontroller.c
Auto-merging Tok/Core/toxcore/toxav/audio.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/audio.h
Auto-merging Tok/Core/toxcore/toxav/audio.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/audio.c
Auto-merging Tok/Core/toxcore/toxav/Makefile.inc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/Makefile.inc
Auto-merging Tok/Core/toxcore/toxav/BUILD.bazel
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/BUILD.bazel
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxOptions.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxOptions.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxDelegate.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxDelegate.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxConstants.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxConstants.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTTox.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTTox.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/nodes.json
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/nodes.json
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFriends.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFriends.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFiles.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFiles.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerChats.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerChats.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerBootstrap.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerBootstrap.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTPeer.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTPeer.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageText.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageText.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageFile.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageFile.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageAbstract.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageAbstract.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriendRequest.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriendRequest.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriend.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriend.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTChat.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTChat.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManagerFactory.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManagerFactory.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManagerConstants.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManagerConstants.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManager.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManager.h
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxOptions.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxOptions.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxConstants.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxConstants.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox+Private.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox+Private.h
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTLogging.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTLogging.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerUserImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerUserImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFriendsImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFriendsImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFilesImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFilesImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerDataSource.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerDataSource.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerBootstrapImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerBootstrapImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerFactory.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerFactory.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileUploadOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileUploadOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation+Private.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation+Private.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine.m
Auto-merging Tok/Core/UserStatus.swift
CONFLICT (add/add): Merge conflict in Tok/Core/UserStatus.swift
Auto-merging Tok/Core/ToxFactory.swift
CONFLICT (add/add): Merge conflict in Tok/Core/ToxFactory.swift
Auto-merging Tok/Core/Results.swift
CONFLICT (add/add): Merge conflict in Tok/Core/Results.swift
Auto-merging Tok/Core/ProtoSchema/Message.pbobjc.m
CONFLICT (add/add): Merge conflict in Tok/Core/ProtoSchema/Message.pbobjc.m
Auto-merging Tok/Core/ProtoSchema/Message.pbobjc.h
CONFLICT (add/add): Merge conflict in Tok/Core/ProtoSchema/Message.pbobjc.h
Auto-merging Tok/Core/ProfileManager.swift
CONFLICT (add/add): Merge conflict in Tok/Core/ProfileManager.swift
Auto-merging Tok/Coordinators/HomeCoordinator.swift
CONFLICT (add/add): Merge conflict in Tok/Coordinators/HomeCoordinator.swift
Auto-merging Tok/Audio/FCAudioPlayer.m
CONFLICT (add/add): Merge conflict in Tok/Audio/FCAudioPlayer.m
Auto-merging Tok/Audio/FCAudioPlayer.h
CONFLICT (add/add): Merge conflict in Tok/Audio/FCAudioPlayer.h
Auto-merging Tok/Assets.xcassets/NavbarBack.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/NavbarBack.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/Settings.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/Settings.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/MyID.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/MyID.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/About.imageset/about@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/About.imageset/about@3x.png
Auto-merging Tok/Assets.xcassets/Me/About.imageset/about@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/About.imageset/about@2x.png
Auto-merging Tok/Assets.xcassets/Home/ChatMute.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/ChatMute.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconScan.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconScan.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconID.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconID.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconGroup.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconGroup.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconAddfriends.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconAddfriends.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Conversation/end-call.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Conversation/end-call.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Conversation/NavbarMore.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Conversation/NavbarMore.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png
Auto-merging Tok/AppDelegate.swift
CONFLICT (add/add): Merge conflict in Tok/AppDelegate.swift
Auto-merging Tok/AppCoordinator.swift
CONFLICT (add/add): Merge conflict in Tok/AppCoordinator.swift
Auto-merging Tok.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in Tok.xcodeproj/project.pbxproj
Auto-merging Podfile.lock
CONFLICT (add/add): Merge conflict in Podfile.lock
Auto-merging Podfile
CONFLICT (add/add): Merge conflict in Podfile
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 feat:Init commit

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
11 months ago
User avatar None

Pushed changes

TOK / Android app

Pushed changes 11 months ago
User avatar None

Pushed changes

TOK / Android app

Pushed changes 11 months ago
User avatar None

Component automatically locked

TOK / iOS app

Component automatically locked 11 months ago
User avatar None

New alert

TOK / iOS app

Could not merge the repository. 11 months ago
User avatar None

Failed rebase on repository

TOK / iOS app

First, rewinding head to replay your work on top of it...
Applying: feat:Init commit
.git/rebase-apply/patch:757: trailing whitespace.
  
.git/rebase-apply/patch:763: trailing whitespace.
  
.git/rebase-apply/patch:927: trailing whitespace.
# Tok iOS
.git/rebase-apply/patch:928: trailing whitespace.

.git/rebase-apply/patch:929: trailing whitespace.
> Make the world connect freely!
warning: squelched 24848 whitespace errors
warning: 24853 lines add whitespace errors.
warning: Cannot merge binary files: Tok/Assets.xcassets/Me/About.imageset/about@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Me/About.imageset/about@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png (HEAD vs. feat:Init commit)
warning: Cannot merge binary files: Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png (HEAD vs. feat:Init commit)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging TokTests/Info.plist
CONFLICT (add/add): Merge conflict in TokTests/Info.plist
Auto-merging Tok/Tok-Bridging-Header.h
CONFLICT (add/add): Merge conflict in Tok/Tok-Bridging-Header.h
Auto-merging Tok/Support Files/Localizable Files/zh-Hans.lproj/Localizable.strings
CONFLICT (add/add): Merge conflict in Tok/Support Files/Localizable Files/zh-Hans.lproj/Localizable.strings
Auto-merging Tok/Support Files/Localizable Files/en.lproj/Localizable.strings
CONFLICT (add/add): Merge conflict in Tok/Support Files/Localizable Files/en.lproj/Localizable.strings
Auto-merging Tok/Support Files/Info.plist
CONFLICT (add/add): Merge conflict in Tok/Support Files/Info.plist
Auto-merging Tok/Services/UserService.swift
CONFLICT (add/add): Merge conflict in Tok/Services/UserService.swift
Auto-merging Tok/Services/NotificationManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/NotificationManager.swift
Auto-merging Tok/Services/FriendService.swift
CONFLICT (add/add): Merge conflict in Tok/Services/FriendService.swift
Auto-merging Tok/Services/CallManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/CallManager.swift
Auto-merging Tok/Services/AvatarManager.swift
CONFLICT (add/add): Merge conflict in Tok/Services/AvatarManager.swift
Auto-merging Tok/Services/AlertAudioPlayer.swift
CONFLICT (add/add): Merge conflict in Tok/Services/AlertAudioPlayer.swift
Auto-merging Tok/Scenes/WebViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/WebViewController.swift
Auto-merging Tok/Scenes/Views/UserStatusView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/UserStatusView.swift
Auto-merging Tok/Scenes/Views/ProgressHUD.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/ProgressHUD.swift
Auto-merging Tok/Scenes/Views/AlertView/AlertViewManager.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/AlertView/AlertViewManager.swift
Auto-merging Tok/Scenes/Views/AlertView/AlertMessageView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Views/AlertView/AlertMessageView.swift
Auto-merging Tok/Scenes/Me/Views/SingleLineCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/SingleLineCell.swift
Auto-merging Tok/Scenes/Me/Views/SettingsCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/SettingsCell.swift
Auto-merging Tok/Scenes/Me/Views/ProfileCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/ProfileCell.swift
Auto-merging Tok/Scenes/Me/Views/PortraitCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/PortraitCell.swift
Auto-merging Tok/Scenes/Me/Views/BotPortraitCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/Views/BotPortraitCell.swift
Auto-merging Tok/Scenes/Me/SettingsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/SettingsViewController.swift
Auto-merging Tok/Scenes/Me/SetPasswordViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/SetPasswordViewController.swift
Auto-merging Tok/Scenes/Me/ProfileViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/ProfileViewController.swift
Auto-merging Tok/Scenes/Me/ProfilePhotoViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/ProfilePhotoViewController.swift
Auto-merging Tok/Scenes/Me/MeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/MeViewController.swift
Auto-merging Tok/Scenes/Me/AboutViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Me/AboutViewController.swift
Auto-merging Tok/Scenes/HomeViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/HomeViewModel.swift
Auto-merging Tok/Scenes/HomeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/HomeViewController.swift
Auto-merging Tok/Scenes/Conversation/Views/ConversationTitleView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Views/ConversationTitleView.swift
Auto-merging Tok/Scenes/Conversation/Models/MessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/MessageModel.swift
Auto-merging Tok/Scenes/Conversation/Models/MediaModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/MediaModel.swift
Auto-merging Tok/Scenes/Conversation/Models/FileMessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/FileMessageModel.swift
Auto-merging Tok/Scenes/Conversation/Models/AudioMessageModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Models/AudioMessageModel.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Protocols/MediaItem.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Protocols/MediaItem.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKitDateFormatter.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKitDateFormatter.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKind.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/MessageKind.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Models/DetectorType.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Models/DetectorType.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Layout/SystemMessageSizeCalculator.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Layout/SystemMessageSizeCalculator.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Layout/MessagesCollectionViewFlowLayout.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Layout/MessagesCollectionViewFlowLayout.swift
Auto-merging Tok/Scenes/Conversation/MessageKit/Sources/Controllers/MessagesViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageKit/Sources/Controllers/MessagesViewController.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/VideoMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/VideoMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/TipMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/TipMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/PhotoMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/PhotoMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/OperationMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/OperationMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/FileMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/FileMessageCell.swift
Auto-merging Tok/Scenes/Conversation/MessageCells/AudioMessageCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/MessageCells/AudioMessageCell.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/UIScrollView+ChatAdditions.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/UIScrollView+ChatAdditions.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/ChatShareMoreView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/ChatShareMoreView.swift
Auto-merging Tok/Scenes/Conversation/InputBar/Views/AudioInputButton.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/InputBar/Views/AudioInputButton.swift
Auto-merging Tok/Scenes/Conversation/ForwardMessageViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ForwardMessageViewModel.swift
Auto-merging Tok/Scenes/Conversation/ForwardChatViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ForwardChatViewController.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController+Subviews.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController+Subviews.swift
Auto-merging Tok/Scenes/Conversation/ConversationViewController+InputBar.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationViewController+InputBar.swift
Auto-merging Tok/Scenes/Conversation/ConversationDataSource.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationDataSource.swift
Auto-merging Tok/Scenes/Conversation/ConversationCollectionViewFlowLayout.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/ConversationCollectionViewFlowLayout.swift
Auto-merging Tok/Scenes/Conversation/Camera/VideoPreviewViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Camera/VideoPreviewViewController.swift
Auto-merging Tok/Scenes/Conversation/Camera/CameraViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Conversation/Camera/CameraViewController.swift
Auto-merging Tok/Scenes/Contracts/Views/RSKPlaceholderTextView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/RSKPlaceholderTextView.swift
Auto-merging Tok/Scenes/Contracts/Views/FriendInfoCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/FriendInfoCell.swift
Auto-merging Tok/Scenes/Contracts/Views/ContractMenuCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/ContractMenuCell.swift
Auto-merging Tok/Scenes/Contracts/Views/ContractDetailCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/Views/ContractDetailCell.swift
Auto-merging Tok/Scenes/Contracts/QRViewerController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/QRViewerController.swift
Auto-merging Tok/Scenes/Contracts/QRScannerController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/QRScannerController.swift
Auto-merging Tok/Scenes/Contracts/InviteFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/InviteFriendViewController.swift
Auto-merging Tok/Scenes/Contracts/InvitationsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/InvitationsViewController.swift
Auto-merging Tok/Scenes/Contracts/FriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/FriendViewController.swift
Auto-merging Tok/Scenes/Contracts/ContactsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/ContactsViewController.swift
Auto-merging Tok/Scenes/Contracts/AddFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Contracts/AddFriendViewController.swift
Auto-merging Tok/Scenes/Choose/Views/SearchFriendsView.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Views/SearchFriendsView.swift
Auto-merging Tok/Scenes/Choose/ChooseFriendViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/ChooseFriendViewController.swift
Auto-merging Tok/Scenes/Choose/Cells/FriendSelectionViewModel.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Cells/FriendSelectionViewModel.swift
Auto-merging Tok/Scenes/Choose/Cells/FriendSelectionCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Choose/Cells/FriendSelectionCell.swift
Auto-merging Tok/Scenes/Chats/Views/ChatsCell.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Chats/Views/ChatsCell.swift
Auto-merging Tok/Scenes/Chats/ChatsViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Chats/ChatsViewController.swift
Auto-merging Tok/Scenes/Call/Views/CallButton.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/Views/CallButton.swift
Auto-merging Tok/Scenes/Call/CallIncomingController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallIncomingController.swift
Auto-merging Tok/Scenes/Call/CallBaseController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallBaseController.swift
Auto-merging Tok/Scenes/Call/CallActiveController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Call/CallActiveController.swift
Auto-merging Tok/Scenes/BaseViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/BaseViewController.swift
Auto-merging Tok/Scenes/Auth/WelcomeViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/WelcomeViewController.swift
Auto-merging Tok/Scenes/Auth/RegisterViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/RegisterViewController.swift
Auto-merging Tok/Scenes/Auth/LoginViewController.swift
CONFLICT (add/add): Merge conflict in Tok/Scenes/Auth/LoginViewController.swift
Auto-merging Tok/Extensions/URLExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/URLExtension.swift
Auto-merging Tok/Extensions/UIViewExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIViewExtension.swift
Auto-merging Tok/Extensions/UIViewControllerExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIViewControllerExtension.swift
Auto-merging Tok/Extensions/UIImageExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImageExtension.swift
Auto-merging Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.m
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.m
Auto-merging Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.h
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIImage+GroupIcon/UIImage+Addtions.h
Auto-merging Tok/Extensions/UIColorExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIColorExtension.swift
Auto-merging Tok/Extensions/UIButtonExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIButtonExtension.swift
Auto-merging Tok/Extensions/UIApplicationExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/UIApplicationExtension.swift
Auto-merging Tok/Extensions/StringExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/StringExtension.swift
Auto-merging Tok/Extensions/OCTSubmanagerObjectsExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/OCTSubmanagerObjectsExtension.swift
Auto-merging Tok/Extensions/OCTManagerConfigurationExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/OCTManagerConfigurationExtension.swift
Auto-merging Tok/Extensions/DataExtension.swift
CONFLICT (add/add): Merge conflict in Tok/Extensions/DataExtension.swift
Auto-merging Tok/Core/toxcore/toxcore/util_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util_test.cc
Auto-merging Tok/Core/toxcore/toxcore/util.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util.h
Auto-merging Tok/Core/toxcore/toxcore/util.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/util.c
Auto-merging Tok/Core/toxcore/toxcore/tox_api.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox_api.c
Auto-merging Tok/Core/toxcore/toxcore/tox.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.h
Auto-merging Tok/Core/toxcore/toxcore/tox.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.c
Auto-merging Tok/Core/toxcore/toxcore/tox.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/tox.api.h
Auto-merging Tok/Core/toxcore/toxcore/state.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/state.h
Auto-merging Tok/Core/toxcore/toxcore/state.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/state.c
Auto-merging Tok/Core/toxcore/toxcore/ping_array_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array_test.cc
Auto-merging Tok/Core/toxcore/toxcore/ping_array.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.h
Auto-merging Tok/Core/toxcore/toxcore/ping_array.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.c
Auto-merging Tok/Core/toxcore/toxcore/ping_array.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping_array.api.h
Auto-merging Tok/Core/toxcore/toxcore/ping.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.h
Auto-merging Tok/Core/toxcore/toxcore/ping.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.c
Auto-merging Tok/Core/toxcore/toxcore/ping.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ping.api.h
Auto-merging Tok/Core/toxcore/toxcore/onion_client.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_client.h
Auto-merging Tok/Core/toxcore/toxcore/onion_client.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_client.c
Auto-merging Tok/Core/toxcore/toxcore/onion_announce.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_announce.h
Auto-merging Tok/Core/toxcore/toxcore/onion_announce.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion_announce.c
Auto-merging Tok/Core/toxcore/toxcore/onion.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion.h
Auto-merging Tok/Core/toxcore/toxcore/onion.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/onion.c
Auto-merging Tok/Core/toxcore/toxcore/network.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/network.h
Auto-merging Tok/Core/toxcore/toxcore/network.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/network.c
Auto-merging Tok/Core/toxcore/toxcore/net_crypto.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/net_crypto.h
Auto-merging Tok/Core/toxcore/toxcore/net_crypto.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/net_crypto.c
Auto-merging Tok/Core/toxcore/toxcore/mono_time_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time_test.cc
Auto-merging Tok/Core/toxcore/toxcore/mono_time.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time.h
Auto-merging Tok/Core/toxcore/toxcore/mono_time.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/mono_time.c
Auto-merging Tok/Core/toxcore/toxcore/logger.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/logger.h
Auto-merging Tok/Core/toxcore/toxcore/logger.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/logger.c
Auto-merging Tok/Core/toxcore/toxcore/list.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/list.h
Auto-merging Tok/Core/toxcore/toxcore/list.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/list.c
Auto-merging Tok/Core/toxcore/toxcore/group.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/group.h
Auto-merging Tok/Core/toxcore/toxcore/group.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/group.c
Auto-merging Tok/Core/toxcore/toxcore/friend_requests.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_requests.h
Auto-merging Tok/Core/toxcore/toxcore/friend_requests.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_requests.c
Auto-merging Tok/Core/toxcore/toxcore/friend_connection.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_connection.h
Auto-merging Tok/Core/toxcore/toxcore/friend_connection.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/friend_connection.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core_test.cc
Auto-merging Tok/Core/toxcore/toxcore/crypto_core_mem.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core_mem.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.h
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.c
Auto-merging Tok/Core/toxcore/toxcore/crypto_core.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/crypto_core.api.h
Auto-merging Tok/Core/toxcore/toxcore/ccompat.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/ccompat.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_server.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_server.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_server.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_server.c
Auto-merging Tok/Core/toxcore/toxcore/TCP_connection.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_connection.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_connection.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_connection.c
Auto-merging Tok/Core/toxcore/toxcore/TCP_client.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_client.h
Auto-merging Tok/Core/toxcore/toxcore/TCP_client.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/TCP_client.c
Auto-merging Tok/Core/toxcore/toxcore/Messenger.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Messenger.h
Auto-merging Tok/Core/toxcore/toxcore/Messenger.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Messenger.c
Auto-merging Tok/Core/toxcore/toxcore/Makefile.inc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/Makefile.inc
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.h
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.c
Auto-merging Tok/Core/toxcore/toxcore/LAN_discovery.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/LAN_discovery.api.h
Auto-merging Tok/Core/toxcore/toxcore/DHT.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/DHT.h
Auto-merging Tok/Core/toxcore/toxcore/DHT.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/DHT.c
Auto-merging Tok/Core/toxcore/toxcore/BUILD.bazel
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxcore/BUILD.bazel
Auto-merging Tok/Core/toxcore/toxav/video.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/video.h
Auto-merging Tok/Core/toxcore/toxav/video.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/video.c
Auto-merging Tok/Core/toxcore/toxav/toxav_old.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav_old.c
Auto-merging Tok/Core/toxcore/toxav/toxav.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.h
Auto-merging Tok/Core/toxcore/toxav/toxav.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.c
Auto-merging Tok/Core/toxcore/toxav/toxav.api.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/toxav.api.h
Auto-merging Tok/Core/toxcore/toxav/rtp_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp_test.cc
Auto-merging Tok/Core/toxcore/toxav/rtp.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp.h
Auto-merging Tok/Core/toxcore/toxav/rtp.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/rtp.c
Auto-merging Tok/Core/toxcore/toxav/ring_buffer_test.cc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer_test.cc
Auto-merging Tok/Core/toxcore/toxav/ring_buffer.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer.h
Auto-merging Tok/Core/toxcore/toxav/ring_buffer.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/ring_buffer.c
Auto-merging Tok/Core/toxcore/toxav/msi.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/msi.h
Auto-merging Tok/Core/toxcore/toxav/msi.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/msi.c
Auto-merging Tok/Core/toxcore/toxav/groupav.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/groupav.h
Auto-merging Tok/Core/toxcore/toxav/groupav.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/groupav.c
Auto-merging Tok/Core/toxcore/toxav/bwcontroller.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/bwcontroller.h
Auto-merging Tok/Core/toxcore/toxav/bwcontroller.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/bwcontroller.c
Auto-merging Tok/Core/toxcore/toxav/audio.h
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/audio.h
Auto-merging Tok/Core/toxcore/toxav/audio.c
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/audio.c
Auto-merging Tok/Core/toxcore/toxav/Makefile.inc
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/Makefile.inc
Auto-merging Tok/Core/toxcore/toxav/BUILD.bazel
CONFLICT (add/add): Merge conflict in Tok/Core/toxcore/toxav/BUILD.bazel
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxOptions.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxOptions.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxDelegate.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxDelegate.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxConstants.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTToxConstants.h
Auto-merging Tok/Core/objcTox/Classes/Public/Wrapper/OCTTox.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Wrapper/OCTTox.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/nodes.json
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/nodes.json
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFriends.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFriends.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFiles.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerFiles.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerChats.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerChats.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerBootstrap.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Submanagers/OCTSubmanagerBootstrap.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTPeer.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTPeer.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageText.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageText.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageFile.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageFile.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageAbstract.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTMessageAbstract.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriendRequest.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriendRequest.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriend.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTFriend.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTChat.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/Objects/OCTChat.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManagerFactory.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManagerFactory.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManagerConstants.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManagerConstants.h
Auto-merging Tok/Core/objcTox/Classes/Public/Manager/OCTManager.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Public/Manager/OCTManager.h
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxOptions.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxOptions.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxConstants.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTToxConstants.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox.m
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox+Private.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTTox+Private.h
Auto-merging Tok/Core/objcTox/Classes/Private/Wrapper/OCTLogging.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Wrapper/OCTLogging.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerUserImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerUserImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFriendsImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFriendsImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFilesImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerFilesImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerDataSource.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerDataSource.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerChatsImpl.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerBootstrapImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Submanagers/OCTSubmanagerBootstrapImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerImpl.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/OCTManagerFactory.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/OCTManagerFactory.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Messages/OCTSendMessageOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileUploadOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileUploadOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileDownloadOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation+Private.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/OCTFileBaseOperation+Private.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Files/NSError+OCTFile.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.m
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.h
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Database/OCTRealmManager.h
Auto-merging Tok/Core/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine.m
CONFLICT (add/add): Merge conflict in Tok/Core/objcTox/Classes/Private/Manager/Audio/OCTAudioEngine.m
Auto-merging Tok/Core/UserStatus.swift
CONFLICT (add/add): Merge conflict in Tok/Core/UserStatus.swift
Auto-merging Tok/Core/ToxFactory.swift
CONFLICT (add/add): Merge conflict in Tok/Core/ToxFactory.swift
Auto-merging Tok/Core/Results.swift
CONFLICT (add/add): Merge conflict in Tok/Core/Results.swift
Auto-merging Tok/Core/ProtoSchema/Message.pbobjc.m
CONFLICT (add/add): Merge conflict in Tok/Core/ProtoSchema/Message.pbobjc.m
Auto-merging Tok/Core/ProtoSchema/Message.pbobjc.h
CONFLICT (add/add): Merge conflict in Tok/Core/ProtoSchema/Message.pbobjc.h
Auto-merging Tok/Core/ProfileManager.swift
CONFLICT (add/add): Merge conflict in Tok/Core/ProfileManager.swift
Auto-merging Tok/Coordinators/HomeCoordinator.swift
CONFLICT (add/add): Merge conflict in Tok/Coordinators/HomeCoordinator.swift
Auto-merging Tok/Audio/FCAudioPlayer.m
CONFLICT (add/add): Merge conflict in Tok/Audio/FCAudioPlayer.m
Auto-merging Tok/Audio/FCAudioPlayer.h
CONFLICT (add/add): Merge conflict in Tok/Audio/FCAudioPlayer.h
Auto-merging Tok/Assets.xcassets/NavbarBack.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/NavbarBack.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/Settings.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/Settings.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/MyID.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/MyID.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Me/About.imageset/about@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/About.imageset/about@3x.png
Auto-merging Tok/Assets.xcassets/Me/About.imageset/about@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Me/About.imageset/about@2x.png
Auto-merging Tok/Assets.xcassets/Home/ChatMute.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/ChatMute.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconScan.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconScan.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconID.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconID.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconGroup.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconGroup.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Home/BarbuttoniconAddfriends.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Home/BarbuttoniconAddfriends.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Conversation/end-call.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Conversation/end-call.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Conversation/NavbarMore.imageset/Contents.json
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Conversation/NavbarMore.imageset/Contents.json
Auto-merging Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color8.imageset/color8@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color8.imageset/color8@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color7.imageset/color7@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color7.imageset/color7@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color6.imageset/color6@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color6.imageset/color6@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color5.imageset/color5@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color5.imageset/color5@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color4.imageset/color4@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color4.imageset/color4@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color3.imageset/color3@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color3.imageset/color3@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color2.imageset/color2@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color2.imageset/color2@2x.png
Auto-merging Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color1.imageset/color1@3x.png
Auto-merging Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png
CONFLICT (add/add): Merge conflict in Tok/Assets.xcassets/Colors/color1.imageset/color1@2x.png
Auto-merging Tok/AppDelegate.swift
CONFLICT (add/add): Merge conflict in Tok/AppDelegate.swift
Auto-merging Tok/AppCoordinator.swift
CONFLICT (add/add): Merge conflict in Tok/AppCoordinator.swift
Auto-merging Tok.xcodeproj/project.pbxproj
CONFLICT (add/add): Merge conflict in Tok.xcodeproj/project.pbxproj
Auto-merging Podfile.lock
CONFLICT (add/add): Merge conflict in Podfile.lock
Auto-merging Podfile
CONFLICT (add/add): Merge conflict in Podfile
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 feat:Init commit

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
11 months ago
User avatar None

Pushed changes

TOK / Android app

Pushed changes a year ago
User avatar wdggg

Translation changed

TOK / Android appChinese (Simplified)

a year ago
Browse all project changes