diff --git a/ferramentas/buffer/exemplo.htm b/ferramentas/buffer/exemplo.htm index b21c812..5d40af4 100644 --- a/ferramentas/buffer/exemplo.htm +++ b/ferramentas/buffer/exemplo.htm @@ -1,3 +1,18 @@ +<<<<<<< .mine + + + + + + + + +======= @@ -11,4 +26,4 @@ i3GEO.parametros.mapfile = "x" i3GEO.analise.dialogo.buffer() - \ No newline at end of file +>>>>>>> .r1096 -- libgit2 0.21.2