stratos-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dinithis <...@git.apache.org>
Subject [GitHub] stratos pull request: Renamed files and variables to a common stan...
Date Fri, 06 Feb 2015 18:16:19 GMT
Github user dinithis commented on the pull request:

    https://github.com/apache/stratos/pull/216#issuecomment-73285605
  
    I'll look into this.
    
    On Fri, Feb 6, 2015 at 11:39 PM, Imesh Guaratne <notifications@github.com>
    wrote:
    
    > Thanks @dinithis <https://github.com/dinithis> for your contribution, I
    > see following conflicts in this pull request:
    >
    > CONFLICT (content): Merge conflict in samples/applications/single-group-v2/artifacts/mock/deployment-policy.json
    > CONFLICT (content): Merge conflict in samples/applications/nested-group/artifacts/openstack/deployment-policy.json
    > CONFLICT (content): Merge conflict in samples/applications/nested-group/artifacts/kubernetes/deployment-policy.json
    > CONFLICT (content): Merge conflict in samples/applications/nested-group/artifacts/ec2/deployment-policy.json
    >
    > —
    > Reply to this email directly or view it on GitHub
    > <https://github.com/apache/stratos/pull/216#issuecomment-73284624>.
    >
    
    
    
    -- 
    *Dinithi De Silva*
    Associate Software Engineer, WSO2 Inc.
    m:+94716667655 | e:dinithis@wso2.com | w: www.wso2.com
    | a: #20, Palm Grove, Colombo 03



---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message