Skip to content

Commit

Permalink
resolve conflicts with newInfo patch
Browse files Browse the repository at this point in the history
  • Loading branch information
Julesssss committed Jul 15, 2024
1 parent 61c2bb0 commit 1860fb2
Showing 1 changed file with 0 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2610,48 +2610,24 @@ index 6982220..b515270 100644
};
export default _default;
diff --git a/node_modules/@react-native-community/netinfo/package.json b/node_modules/@react-native-community/netinfo/package.json
<<<<<<< HEAD
index 3c80db2..61e6564 100644
--- a/node_modules/@react-native-community/netinfo/package.json
+++ b/node_modules/@react-native-community/netinfo/package.json
@@ -48,6 +48,7 @@
"network info"
],
"peerDependencies": {
+ "react": "*",
"react-native": ">=0.59"
},
"dependencies": {},
@@ -121,5 +122,13 @@
"yarn eslint --fix",
"git add"
]
+ },
=======
index 3c80db2..15d214d 100644
--- a/node_modules/@react-native-community/netinfo/package.json
+++ b/node_modules/@react-native-community/netinfo/package.json
@@ -97,6 +97,14 @@
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.11.3"
},
>>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build)
+ "codegenConfig": {
+ "name": "RNCNetInfoSpec",
+ "type": "modules",
+ "jsSrcsDir": "src/internal",
+ "android": {
+ "javaPackageName": "com.reactnativecommunity.netinfo"
+ }
<<<<<<< HEAD
}
}
=======
+ },
"repository": {
"type": "git",
"url": "https://github.com/react-native-netinfo/react-native-netinfo.git"
>>>>>>> 24c11b4b (Merge pull request #45389 from software-mansion-labs/kicu/fix-newarch-build)
diff --git a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec b/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
index e34e728..9090eb1 100644
--- a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
Expand Down

0 comments on commit 1860fb2

Please sign in to comment.