Hi Johann, Resolved the conflicts. Could you please have a look.
Thanks, Malithi. On Sun, Mar 1, 2015 at 7:12 PM, Malithi Edirisinghe <[email protected]> wrote: > Sure. Will have a look > > > On Sun, Mar 1, 2015 at 6:41 PM, Johann Nallathamby <[email protected]> > wrote: > >> Hi Malithi, >> >> There are merge conflicts in PR. Can you fix them ? >> >> Thanks. >> >> On Sun, Mar 1, 2015 at 6:32 PM, Malithi Edirisinghe <[email protected]> >> wrote: >> >>> Hi, >>> >>> $subject please for JIRA [1]. >>> >>> [1] *https://wso2.org/jira/browse/IDENTITY-3077 >>> <https://wso2.org/jira/browse/IDENTITY-3077>* >>> >>> Thanks, >>> Malithi >>> >>> -- >>> >>> *Malithi Edirisinghe* >>> Senior Software Engineer >>> WSO2 Inc. >>> >>> Mobile : +94 (0) 718176807 >>> [email protected] >>> >> >> >> >> -- >> Thanks & Regards, >> >> *Johann Dilantha Nallathamby* >> Associate Technical Lead & Product Lead of WSO2 Identity Server >> Integration Technologies Team >> WSO2, Inc. >> lean.enterprise.middleware >> >> Mobile - *+94777776950* >> Blog - *http://nallaa.wordpress.com <http://nallaa.wordpress.com>* >> > > > > -- > > *Malithi Edirisinghe* > Senior Software Engineer > WSO2 Inc. > > Mobile : +94 (0) 718176807 > [email protected] > -- *Malithi Edirisinghe* Senior Software Engineer WSO2 Inc. Mobile : +94 (0) 718176807 [email protected]
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
