Commit 3a3cca36e18e2f1ed0fd74c1a95650b5b2868ce2
1 parent
9da09e1d
Exists in
master
and in
7 other branches
--no commit message
Showing
1 changed file
with
16 additions
and
1 deletions
Show diff stats
ferramentas/buffer/exemplo.htm
| 1 | +<<<<<<< .mine | |
| 2 | +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | |
| 3 | +<html> | |
| 4 | +<head> | |
| 5 | +<script type="text/javascript" src="../../classesjs/i3geo.js"></script> | |
| 6 | +</head> | |
| 7 | +<body id="i3geo" class=yui-skin-sam > | |
| 8 | +<script type="text/javascript"> | |
| 9 | +i3GEO.configura.locaplic = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo"; | |
| 10 | +var g_localimg = i3GEO.util.protocolo()+"://"+window.location.host+"/i3geo/imagens"; | |
| 11 | +i3GEO.parametros.mapfile = "x" | |
| 12 | +i3GEO.analise.dialogo.distanciaptpt() | |
| 13 | +</script> | |
| 14 | +</body> | |
| 15 | +</html>======= | |
| 1 | 16 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> |
| 2 | 17 | <html> |
| 3 | 18 | <head> |
| ... | ... | @@ -11,4 +26,4 @@ i3GEO.parametros.mapfile = "x" |
| 11 | 26 | i3GEO.analise.dialogo.buffer() |
| 12 | 27 | </script> |
| 13 | 28 | </body> |
| 14 | -</html> | |
| 15 | 29 | \ No newline at end of file |
| 30 | +</html>>>>>>>> .r1096 | ... | ... |