Skip to content
Snippets Groups Projects
Commit 6447f1b7 authored by Valerio Mariani's avatar Valerio Mariani
Browse files

Merge branch 'release-1.2' of bc2-dng01.bc2.unibas.ch:/opt/git/GIT_DATA/ost into release-1.2 

Conflicts:
	modules/io/src/mol/pdb_reader.cc
parents 77adb0d2 cb95bbe1
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
modules/io/src/mol/pdb_reader.cc
+ 10
− 10
View file @ 6447f1b7
File changed. Contains only whitespace changes. Show whitespace changes.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment