[GitHub] cloudstack pull request: resolving a conflict due to reformatting

[remibergsma]

Github user remibergsma commented on the pull request:

    https://github.com/apache/cloudstack/pull/1344#issuecomment-172503325
  
    After merging this PR shows much more commits and changed files than before 
merge.
    
    For the record, this what I saw at the moment of merging:
    
    ![screen shot 2016-01-18 at 12 14 
26](https://cloud.githubusercontent.com/assets/1630096/12390311/067d0b2e-bddf-11e5-8f09-651fc92ff090.png)
    
    This is the log of my commands:
    
    ![screen shot 2016-01-18 at 12 14 
36](https://cloud.githubusercontent.com/assets/1630096/12390318/0c59f282-bddf-11e5-99bc-e8f473a7c0cf.png)
    
    Everything seems OK. @DaanHoogland can you please validate it went well? 
Thanks.


---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---