Created
March 23, 2012 14:25
-
-
Save bartvde/2171124 to your computer and use it in GitHub Desktop.
dwins
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| bart-van-den-eijndens-macbook-pro:geonode-client bartvde$ git pull git://github.com/GeoNode/geonode-client.git synth | |
| remote: Counting objects: 101, done. | |
| remote: Compressing objects: 100% (39/39), done. | |
| remote: Total 81 (delta 53), reused 70 (delta 42) | |
| Unpacking objects: 100% (81/81), done. | |
| From git://github.com/GeoNode/geonode-client | |
| * branch synth -> FETCH_HEAD | |
| warning: too many files (created: 612 deleted: 439), skipping inexact rename detection | |
| CONFLICT (delete/modify): app/autoloader.js deleted in HEAD and modified in 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a. Version 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a of app/autoloader.js left in tree. | |
| CONFLICT (delete/modify): app/static/externals/gxp deleted in HEAD and modified in 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a. Version 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a of app/static/externals/gxp left in tree. | |
| CONFLICT (delete/modify): app/static/script/app/GeoExplorer.js deleted in HEAD and modified in 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a. Version 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a of app/static/script/app/GeoExplorer.js left in tree. | |
| CONFLICT (delete/modify): buildjs.cfg deleted in HEAD and modified in 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a. Version 0a28f5d739ada1f5a96a6f99e04a26c1a51ca34a of buildjs.cfg left in tree. | |
| Auto-merging src/geonode-client/app/static/script/app/GeoExplorer/Viewer.js | |
| Automatic merge failed; fix conflicts and then commit the result. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment