Skip to content

Commit

Permalink
Resolved merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ishika1403 committed May 5, 2021
1 parent 4c3e598 commit 27292d8
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions app.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
{
"expo": {
"name": "Libgenie",
"description": "The next generation library management app",
"slug": "libgenie",
"version": "0.0.1",
"orientation": "portrait",
"icon": "./assets/logo.png",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"updates": {
"fallbackToCacheTimeout": 0
},
"primaryColor": "#33af85",
"assetBundlePatterns": ["**/*"],
"android": {
"package": "com.libgenie.app",
"versionCode": 1,
"adaptiveIcon": {
"foregroundImage": "./assets/logo-adaptive.png",
"backgroundColor": "#33af85"
},
"permissions": []
}
}
"expo": {
"name": "Libgenie",
"description": "The next generation library management app",
"slug": "libgenie",
"version": "0.0.1",
"orientation": "portrait",
"icon": "./assets/logo.png",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#33af85"
},
"updates": {
"fallbackToCacheTimeout": 0
},
"primaryColor": "#33af85",
"assetBundlePatterns": ["**/*"],
"android": {
"package": "com.libgenie.app",
"versionCode": 1,
"adaptiveIcon": {
"foregroundImage": "./assets/logo-adaptive.png",
"backgroundColor": "#33af85"
},
"permissions": []
}
}
}
Binary file modified assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 27292d8

Please sign in to comment.