OSDN Git Service
(root)
/
eos
/
base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git.osdn.jp:/gitroot/eos/base
[eos/base.git]
/
src
/
Tools
/
pdbUtil
/
pdbTwoProteinFit
/
src
/
pdbTwoProteinFit.html
diff --git
a/src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
b/src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
index
71873eb
..
d4170f0
100755
(executable)
--- a/
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
+++ b/
src/Tools/pdbUtil/pdbTwoProteinFit/src/pdbTwoProteinFit.html
@@
-1
+1,5
@@
+<<<<<<< HEAD
/bin/bash: pdbTwoProteinFit: そのようなファイルやディレクトリはありません
+=======
+/bin/bash: pdbTwoProteinFit: No such file or directory
+>>>>>>> dfe085c4a1f53fa8551dc522aacbdc9dc53598aa