• R/O
  • HTTP
  • SSH
  • HTTPS

base: コミット

This repository is a base of Eos.


コミットメタ情報

リビジョン5c1f42ca335d6b8bd455b339b664d13907e71638 (tree)
日時2014-11-22 08:10:28
作者Takuo Yasunaga <yasunaga@bio....>
コミッターTakuo Yasunaga

ログメッセージ

modified: src/Tools/mrcImage/mrcImageShrink/src/test/Makefile

変更サマリ

差分

--- a/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
@@ -3,28 +3,17 @@ include ../../../Config/Define.inc
33 include ../../../../Config/Define.inc
44 include ../../../../../Config/Define.inc
55
6-<<<<<<< HEAD
7-all: help exec
8-
9-=======
106 NAME=data/121p
117
128 all: help exec
139
1410
15->>>>>>> FETCH_HEAD
1611 help:
1712 @echo "----- Help Message Check -----"
1813 @../$(OSTYPE)/$(OBJECTNAME) -h
1914
2015 exec:
2116 @echo "----- Execution Check -----"
22-<<<<<<< HEAD
23- ../$(OSTYPE)/$(OBJECTNAME)
24- @echo "----- Calc check -----"
25-
26-clean:
27-=======
2817 ../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc3d -o $(NAME).mrc3d.shrink -S 4
2918 ../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc2d -o $(NAME).mrc2d.shrink -S 4
3019 @echo "----- Calc check -----"
@@ -34,4 +23,3 @@ clean:
3423 init:
3524 pdb2mrc -i $(NAME).pdb -o $(NAME).mrc3d -nx 64 -ny 64 -nz 64 -Sx -32 -Sy -32 -Sz -32 -dx 1 -dy 1 -dz 1 -w 1 -sig 2.6 -m 0
3625 pdb2mrc2d -i $(NAME).pdb -o $(NAME).mrc2d -d 1 1 -s -32 -32 -n 64 64 -w 1.0 -sig 2.6 -Rot 1 1
37->>>>>>> FETCH_HEAD
旧リポジトリブラウザで表示