Commit 305d9f8f authored by Julio Tambara's avatar Julio Tambara
Browse files

Merge branch 'master' of cta.if.ufrgs.br:/git/estacaoespectrometria

Conflicts:
	newmodulo.py
parents 472b7388 d33dc402
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment