bluejoyq / searchGuide

Go to a project
Toggle navigation Toggle navigation pinning
bluejoyq
46a9d0c4 1 parent 86b8c027

hidden error!

Inline Side-by-side
Showing 3 changed files with 2 additions and 6 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 "devToolsPort": 19002, 2 "devToolsPort": 19002,
3 "expoServerPort": 19000, 3 "expoServerPort": 19000,
4 "packagerPort": 19001, 4 "packagerPort": 19001,
5 - "packagerPid": 14768, 5 + "packagerPid": 13860,
6 "expoServerNgrokUrl": "https://x2-7pb.anonymous.searchguide.exp.direct", 6 "expoServerNgrokUrl": "https://x2-7pb.anonymous.searchguide.exp.direct",
7 "packagerNgrokUrl": "https://packager.x2-7pb.anonymous.searchguide.exp.direct", 7 "packagerNgrokUrl": "https://packager.x2-7pb.anonymous.searchguide.exp.direct",
8 "ngrokPid": 9336 8 "ngrokPid": 9336
......
1 { 1 {
2 - "hostType": "tunnel", 2 + "hostType": "lan",
3 "lanType": "ip", 3 "lanType": "ip",
4 "dev": true, 4 "dev": true,
5 "minify": false, 5 "minify": false,
......
...@@ -5,11 +5,7 @@ ...@@ -5,11 +5,7 @@
5 "privacy": "public", 5 "privacy": "public",
6 "sdkVersion": "35.0.0", 6 "sdkVersion": "35.0.0",
7 "androidStatusBar": { 7 "androidStatusBar": {
8 -<<<<<<< HEAD
9 - "backgroundColor": "#20272F"
10 -=======
11 "backgroundColor": "#2C658E" 8 "backgroundColor": "#2C658E"
12 ->>>>>>> master
13 }, 9 },
14 "platforms": [ 10 "platforms": [
15 "ios", 11 "ios",
......