Fixing conflicts issues

This commit is contained in:
Geeth Munasinghe 2015-02-10 10:40:33 +05:30
commit f9f4e8a8be
2 changed files with 4 additions and 2 deletions

2
.gitignore vendored
View File

@ -20,3 +20,5 @@ target
*.war *.war
*.ear *.ear
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

View File

@ -1,5 +1,5 @@
product-mdm #carbon-device-mgt-plugins
===========
WSO2 MOBILE DEVICE MANAGER 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. 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.