Hi sharon, There is a conflict. can you please update your repo with latest updates in wso2/carbon-business-process and make PR.
Thanks, Milinda On Fri, Aug 21, 2015 at 2:03 PM, Sharon David <[email protected]> wrote: > Hi, > > Please review and merge the pull request [1 > <https://github.com/wso2/carbon-business-process/pull/152>], > I have done some changed to the markup, let me know if you have any issues. > > [1] https://github.com/wso2/carbon-business-process/pull/152 > <https://github.com/wso2/carbon-business-process/pull/152> > > -- > Sharon David > Software Engineer - UI/UX | WSO2 Inc > > +94 777 668 411 | [email protected] | http://wso2.com > -- Milinda Perera Software Engineer; WSO2 Inc. http://wso2.com , Mobile: (+94) 714 115 032
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
