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
Devex: Resolve merge conflicts
dev
#143Devex: Resolve merge conflicts
dev
#143Changes from 22 commits
e5e4da4
1cffcdf
ec0c753
193f05d
58435dc
8f59b04
ec868d8
804f7de
48314ae
0b2eb31
37a7c11
91a8c49
f98f0d2
9e55193
f66f758
2ad8cc7
75ad1d1
4c8e2e5
3f32584
b81500d
d268d14
1cb9afa
c6dace0
7effc4c
cd5d630
564d0f9
af8f76c
f2ef3a6
2c633d2
f299d4a
63dc37d
0e6b4af
c9b8cf8
abe5703
9c4dc72
62aa39d
8e7f752
7b7114d
6e65f04
4af9905
7af507c
2191a04
0582b3b
b370ff5
f0837f2
27c9220
d1c81ea
f271502
cea4d43
3e1a650
851a5ba
485f464
dfdf945
dda0b05
d56c4b1
bab7a92
a37ff1d
7ac3278
29eb7a0
9940944
bafae70
d21f519
7efa574
9d8555b
0e266d7
1405702
240c4e8
8085287
a797883
20f9528
6fb21a6
2a7b9e9
c6ef19c
1a85f40
c427f2d
5d52f83
bbf2b53
e9ed1a4
734f9ca
92677b0
573c633
0e8b655
a9488cc
906daf8
b8e598e
f57b549
740a10a
993035f
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.