trying to solve another problem caused by git
	modified:   report/Abstract.tex
	modified:   report/Conclusion.tex
	modified:   report/GitStructure.tex
	modified:   report/Introduction.tex
	modified:   report/Operations.tex
	modified:   report/Properties.tex
	modified:   report/Report.pdf
	modified:   report/Report.tex
	modified:   report/biblio.bib
	new file:   report/title_page_1.tex
	modified:   sources/model/Aux.als
	modified:   sources/model/Properties.als
still trying to solve git brought us
	new file:   Abstract.tex
	new file:   AppendixBug.tex
	new file:   Conclusion.tex
	new file:   GitStructure.tex
	new file:   Introduction.tex
	new file:   Operations.tex
	new file:   Properties.tex
	new file:   Report.pdf
	new file:   Report.tex
	new file:   biblio.bib
	new file:   images/2merge.png
	new file:   images/3merge.png
	new file:   images/Imagens.graffle
	new file:   images/Legenda.png
	new file:   images/add1.png
	new file:   images/branch.png
	new file:   images/checkout.png
	new file:   images/commit1.png
	new file:   images/commit2.png
	new file:   images/commit_pre.png
	new file:   images/fast_forward.png
	new file:   images/fast_forward_merge1.png
	new file:   images/fast_forward_merge_pre.png
	new file:   images/git_workflow.png
	new file:   images/gitbug1.png
	new file:   images/gitbug2.png
	new file:   images/gitbug3.png
	new file:   images/merge2way.png
	new file:   images/merge3way.png
	new file:   images/notsosimplecheckout.png
	new file:   images/object_assoc.png
	new file:   images/remove1.png
	new file:   images/remove2.png
	new file:   images/update1.png
	new file:   makefile

 Changes not staged for commit:
   (use "git add/rm <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    ../Report/Abstract.tex
	deleted:    ../Report/AppendixBug.tex
	deleted:    ../Report/Conclusion.tex
	deleted:    ../Report/GitStructure.tex
	deleted:    ../Report/Introduction.tex
	deleted:    ../Report/Operations.tex
	deleted:    ../Report/Properties.tex
	deleted:    ../Report/Report.pdf
	deleted:    ../Report/Report.synctex.gz
	deleted:    ../Report/Report.tex
	deleted:    ../Report/biblio.bib
	deleted:    ../Report/images/2merge.png
	deleted:    ../Report/images/3merge.png
	deleted:    ../Report/images/Imagens.graffle
	deleted:    ../Report/images/Legenda.png
	deleted:    ../Report/images/add1.png
	deleted:    ../Report/images/branch.png
	deleted:    ../Report/images/checkout.png
	deleted:    ../Report/images/commit1.png
	deleted:    ../Report/images/commit2.png
	deleted:    ../Report/images/commit_pre.png
	deleted:    ../Report/images/fast_forward.png
	deleted:    ../Report/images/fast_forward_merge1.png
	deleted:    ../Report/images/fast_forward_merge_pre.png
	deleted:    ../Report/images/git_workflow.png
	deleted:    ../Report/images/gitbug1.png
	deleted:    ../Report/images/gitbug2.png
	deleted:    ../Report/images/gitbug3.png
	deleted:    ../Report/images/merge2way.png
	deleted:    ../Report/images/merge3way.png
	deleted:    ../Report/images/notsosimplecheckout.png
	deleted:    ../Report/images/object_assoc.png
	deleted:    ../Report/images/remove1.png
	deleted:    ../Report/images/remove2.png
	deleted:    ../Report/images/update1.png
	deleted:    ../Report/makefile
	deleted:    ../Report/report.synctex (from Renato-nevess-macbook - 3).gz
	deleted:    ../Report/report.synctex (from Renato-nevess-macbook - 4).gz
	deleted:    ../Report/report.synctex (from Renato-nevess-macbook).gz
git problem
	deleted:    Report/Abstract.tex
	deleted:    Report/AppendixBug.tex
	deleted:    Report/Conclusion.tex
	deleted:    Report/GitStructure.tex
	deleted:    Report/Introduction.tex
	deleted:    Report/Operations.tex
	deleted:    Report/Properties.tex
	deleted:    Report/Report.pdf
	deleted:    Report/Report.synctex.gz
	deleted:    Report/Report.tex
	deleted:    Report/biblio.bib
	deleted:    Report/images/2merge.png
	deleted:    Report/images/3merge.png
	deleted:    Report/images/Imagens.graffle
	deleted:    Report/images/Legenda.png
	deleted:    Report/images/add1.png
	deleted:    Report/images/branch.png
	deleted:    Report/images/checkout.png
	deleted:    Report/images/commit1.png
	deleted:    Report/images/commit2.png
	deleted:    Report/images/commit_pre.png
	deleted:    Report/images/fast_forward.png
	deleted:    Report/images/fast_forward_merge1.png
	deleted:    Report/images/fast_forward_merge_pre.png
	deleted:    Report/images/git_workflow.png
	deleted:    Report/images/gitbug1.png
	deleted:    Report/images/gitbug2.png
	deleted:    Report/images/gitbug3.png
	deleted:    Report/images/merge2way.png
	deleted:    Report/images/merge3way.png
	deleted:    Report/images/notsosimplecheckout.png
	deleted:    Report/images/object_assoc.png
	deleted:    Report/images/remove1.png
	deleted:    Report/images/remove2.png
	deleted:    Report/images/update1.png
	deleted:    Report/makefile
	deleted:    Report/report.synctex (from Renato-nevess-macbook - 3).gz
	deleted:    Report/report.synctex (from Renato-nevess-macbook - 4).gz
	deleted:    Report/report.synctex (from Renato-nevess-macbook).gz
Merge branch 'ups'

Conflicts:
	report/Report.pdf