Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(ios): Conflicts issue fix #61
base: master
Are you sure you want to change the base?
fix(ios): Conflicts issue fix #61
Changes from all commits
bd9ff2b
9035126
ff016ab
2771131
0bf9d62
9ee3701
8fe6ed3
a391372
c005a89
3f76b46
64a399d
def4c16
41d1218
1d9e6df
a646ff6
fe8eb69
70bf330
98acef1
aaefd5d
630b4f4
79d1100
4f46962
dff0e2e
86fb3ec
befcd83
2430d62
527023a
6ef4fa4
36279da
d52309f
7f97d30
75017d1
3c6899f
c69cb83
c7a6622
7de33f6
1fd0d87
1b5b48e
3a346f6
5e74373
c937bb4
2d45973
42446b8
beb139b
e7ac9ef
acc045f
bf21415
0048c87
b9e847f
ea077fb
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing