Skip to content
Snippets Groups Projects
Commit d7f2920b authored by Gabriel Sartori Klostermann's avatar Gabriel Sartori Klostermann
Browse files

Merge branch 'issue#41' into 'devel' 

issue#41

Descreve introdução da seção de interfaces gráficas para comparação de arquivos e resolução de conflitos.

See merge request !35
parents 06613abb 238fef03
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 18 deletions
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