OSDN Git Service
Merge remote-tracking branch 'refs/remotes/origin/master'
Conflicts:
src/Tools/Integration/imagesView/src/imagesView.html
src/Tools/llData/llDataPrint/src/llDataPrint.html
src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html
src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
It looks like you may be committing a merge.
If this is not correct, please remove the file
.git/MERGE_HEAD
and try again.
Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch and 'origin/master' have diverged,
and have 4 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
All conflicts fixed but you are still merging.
Changes to be committed:
modified: src/Tools/Integration/imagesView/src/imagesView.html
modified: src/Tools/llData/llDataPrint/src/llDataPrint.html
modified: src/Tools/mrcImage/mrcImageConvolution/src/mrcImageConvolution.html
modified: src/Tools/mrcImage/mrcImageNormalizing/src/mrcImageNormalizing.html
modified: src/Tools/pdbUtil/pdb2mrc2d/src/pdb2mrc2d.html
modified: src/Tools/pdbUtil/pdb2mrc2dWithCTF/src/pdb2mrc2dWithCTF.html
modified: src/Tools/pdbUtil/pdbChargeFit/src/pdbChargeFit.html
modified: src/Tools/pdbUtil/pdbCrystalCreate/src/pdbCrystalCreate.html
modified: src/Tools/pdbUtil/pdbHelix/src/pdbHelix.html
modified: src/Tools/pdbUtil/pdbMatrixCreate/src/pdbMatrixCreate.html
modified: src/Tools/pdbUtil/pdbPCA/src/pdbPCA.html
modified: src/Tools/pdbUtil/pdbRotation/src/pdbRotation.html
modified: src/Tools/pdbUtil/pdbShapeFit/src/pdbShapeFit.html
modified: src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
13 files changed: