fixed merge conflict

Author: wagnermaciel

babel.config.js

@@ -1,3 +1,14 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ["module:metro-react-native-babel-preset"],
+  plugins: [
+    [
+      "module-resolver",
+      {
+        alias: {
+          "@react-native-community/netinfo": "./js"
+        },
+        cwd: "babelrc"
+      }
+    ]
+  ]
 };

example/android/app/src/main/java/com/androidprogressbarexample/MainApplication.java

@@ -28,7 +28,7 @@ protected List<ReactPackage> getPackages() {
 
     @Override
     protected String getJSMainModuleName() {
-      return "index";
+      return "example/index";
     }
   };
 

example/ios/AndroidProgressBarExample/AppDelegate.m

@@ -33,7 +33,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
-  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+  return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"example/index" fallbackResource:nil];
 #else
   return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 #endif

package.json

@@ -20,7 +20,8 @@
   },
   "dependencies": {
     "react": "16.8.3",
-    "react-native": "0.59.4"
+    "react-native": "0.59.4",
+    "babel-plugin-module-resolver": "^3.2.0"
   },
   "devDependencies": {
     "@babel/core": "^7.4.3",