From 3a3cca36e18e2f1ed0fd74c1a95650b5b2868ce2 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 29 Jul 2009 01:05:58 +0000
Subject: [PATCH] 

---
 ferramentas/buffer/exemplo.htm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
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
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<script type="text/javascript" src="../../classesjs/i3geo.js"></script>
+</head>
+<body id="i3geo" class=yui-skin-sam >
+<script type="text/javascript">
+i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo";
+var g_localimg = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo/imagens";
+i3GEO.parametros.mapfile = "x"
+i3GEO.analise.dialogo.distanciaptpt()
+</script>
+</body>
+</html>=======
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
@@ -11,4 +26,4 @@ i3GEO.parametros.mapfile = "x"
 i3GEO.analise.dialogo.buffer()
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>>>>>>>> .r1096
--
libgit2 0.21.2

