Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
parity
Mirrored projects
parity-signer
Commits
7f59f773
Commit
7f59f773
authored
Jul 16, 2019
by
Thibaut Sardan
Browse files
fix(): leftover from conflicting
parent
a7518abe
Changes
1
Show whitespace changes
Inline
Side-by-side
android/app/build.gradle
View file @
7f59f773
...
...
@@ -162,11 +162,8 @@ android {
}
dependencies
{
<<<<<<<
HEAD
implementation
project
(
':@react-native-community_netinfo'
)
=======
implementation
project
(
':react-native-camera'
)
>>>>>>>
yj
-
bump
-
reactnative
implementation
project
(
':react-native-secure-storage'
)
implementation
fileTree
(
dir:
"libs"
,
include:
[
"*.jar"
])
implementation
'androidx.appcompat:appcompat:1.0.0'
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment