From 497a979d007677caef60c81d68b988642103e173 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Wed, 19 Nov 2014 13:08:53 +0000
Subject: [PATCH] 

---
 temas/teste.map | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+), 0 deletions(-)

diff --git a/temas/teste.map b/temas/teste.map
index 9da6bde..68d3dc0 100644
--- a/temas/teste.map
+++ b/temas/teste.map
@@ -1,3 +1,39 @@
+<<<<<<< .mine
+MAP
+  FONTSET "../symbols/fontes.txt"
+  SYMBOLSET "../symbols/simbolosv6.sym"
+  LAYER
+    CONNECTION "i3geosaude"
+    CONNECTIONTYPE POSTGIS
+    DATA "geom from (select * from fisico.elem_fisiog_natural) as foo using unique gid using srid=4326"
+    METADATA
+      "METAESTAT_ID_MEDIDA_VARIAVEL"	""
+      "cache"	""
+      "CLASSE"	"SIM"
+      "METAESTAT_CODIGO_TIPO_REGIAO"	""
+      "metaestat"	""
+      "TEMA"	"Teste de localidades"
+      "convcaracter"	""
+      "cortepixels"	"0"
+    END # METADATA
+    NAME "teste"
+    STATUS OFF
+    TEMPLATE "none.htm"
+    TYPE LINE
+    UNITS METERS
+    CLASS
+      NAME ""
+      STYLE
+        COLOR 0 0 0
+        SIZE 12
+        SYMBOL "linha"
+      END # STYLE
+    END # CLASS
+  END # LAYER
+
+END # MAP
+
+=======
 MAP
   FONTSET "../symbols/fontes.txt"
   SYMBOLSET "../symbols/simbolosv6.sym"
@@ -31,3 +67,4 @@ MAP
 
 END # MAP
 
+>>>>>>> .r5411
--
libgit2 0.21.2