Fixing conflicts issues

10 years ago · f9f4e8a8be
parent 3c8a7b62e7 c735bbd793
commit f9f4e8a8be
2 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -20,3 +20,5 @@ target
 *.war
 *.ear

+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
--- a/README.md
+++ b/README.md
@ -1,5 +1,5 @@
-product-mdm
-===========
+#carbon-device-mgt-plugins
+
 WSO2 MOBILE DEVICE MANAGER

 WSO2 Mobile Device Manager (WSO2 MDM) is a comprehensive platform that helps solve mobile computing challenges enterprises face today when dealing with both corporate owned, personally enabled (COPE) devices and employee owned devices as part of a bring your own device (BYOD) program.