Fix merge conflicts

README.md

@@ -116,6 +116,8 @@ console.log("App Version (Readable)", DeviceInfo.getReadableVersion());  // e.g.
 
 console.log("Device Name", DeviceInfo.getDeviceName());  // e.g. Becca's iPhone 6
 
+console.log("User Agent", DeviceInfo.getUserAgent()); // e.g. Dalvik/2.1.0 (Linux; U; Android 5.1; Google Nexus 4 - 5.1.0 - API 22 - 768x1280 Build/LMY47D)
+
 console.log("Device Locale", DeviceInfo.getDeviceLocale()); // e.g en-US
 
 ```

RNDeviceInfo/RNDeviceInfo.m

@@ -116,10 +116,16 @@ RCT_EXPORT_MODULE()
             deviceName = @"iPhone";
         }
     }
-    
+
     return deviceName;
 }
 
+- (NSString*) userAgent
+{
+    UIWebView* webView = [[UIWebView alloc] initWithFrame:CGRectZero];
+    return [webView stringByEvaluatingJavaScriptFromString:@"navigator.userAgent"];
+}
+
 - (NSString*) deviceLocale
 {
     NSString *language = [[NSLocale preferredLanguages] objectAtIndex:0];
@@ -145,6 +151,7 @@ RCT_EXPORT_MODULE()
              @"appVersion": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"],
              @"buildNumber": [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
              @"systemManufacturer": @"Apple",
+             @"userAgent": self.userAgent,
              };
 }
 

android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java

@@ -68,6 +68,7 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
     constants.put("uniqueId", Secure.getString(this.reactContext.getContentResolver(), Secure.ANDROID_ID));
     constants.put("systemManufacturer", Build.MANUFACTURER);
     constants.put("bundleId", packageName);
+    constants.put("userAgent", System.getProperty("http.agent"));
     return constants;
   }
 }

deviceinfo.js

@@ -38,6 +38,9 @@ module.exports = {
   getDeviceName: function() {
     return RNDeviceInfo.deviceName;
   },
+  getUserAgent: function() {
+    return RNDeviceInfo.userAgent;
+  },
   getDeviceLocale: function() {
     return RNDeviceInfo.deviceLocale;
   }