From d32a97f9c22997b425c6429ee4693c8ad1d7bb0e Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Sat, 10 Sep 2011 21:03:38 +0000
Subject: [PATCH] 

---
 ms_criamapa.php | 4 ----
 1 file changed, 0 insertions(+), 4 deletions(-)

diff --git a/ms_criamapa.php b/ms_criamapa.php
index 6c37474..5a105b9 100644
--- a/ms_criamapa.php
+++ b/ms_criamapa.php
@@ -310,11 +310,7 @@ if(!isset($base) || $base == "")
 	}
 	else
 	{
-<<<<<<< .mine
-		$base = "geral1v".versao;
-=======
 		$base = "geral1v".$versao;
->>>>>>> .r2359
 		$estadosl = "estadosl";
 	}
 }
--
libgit2 0.21.2