From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Fri, 21 Nov 2014 23:10:28 +0000 (+0900)
Subject: 	modified:   src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c1f42ca335d6b8bd455b339b664d13907e71638;p=eos%2FhostdependX86LINUX64.git

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

diff --git a/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile b/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
index e6b2404677..8e10369322 100644
--- a/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
@@ -3,28 +3,17 @@ include ../../../Config/Define.inc
 include ../../../../Config/Define.inc
 include ../../../../../Config/Define.inc
 
-<<<<<<< HEAD
-all: help exec
-
-=======
 NAME=data/121p
 
 all: help exec
 
 
->>>>>>> FETCH_HEAD
 help:
 	@echo "----- Help Message Check -----"
 	@../$(OSTYPE)/$(OBJECTNAME)	 -h
 
 exec:
 	@echo "----- Execution Check -----"
-<<<<<<< HEAD
-	../$(OSTYPE)/$(OBJECTNAME) 
-	@echo "----- Calc check -----"		
-
-clean:
-=======
 	../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc3d -o $(NAME).mrc3d.shrink -S 4
 	../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc2d -o $(NAME).mrc2d.shrink -S 4
 	@echo "----- Calc check -----"		
@@ -34,4 +23,3 @@ clean:
 init:
 	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 
 	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  
->>>>>>> FETCH_HEAD