Resolução de conflito de merge

Guilherme Andrade Del Cantoni
2 parents cf1258bb 6fce2445
Showing 1 changed file with 0 additions and 1 deletions Show diff stats
rn/ProcedimentoAndamentoRN.php
@@ -92,7 +92,6 @@ class ProcedimentoAndamentoRN extends InfraRN {
         } catch (Exception $e) {
             $objInfraIBanco->cancelarTransacao();
             throw $e;
-
         }
     }
 }
...	...	@@ -92,7 +92,6 @@ class ProcedimentoAndamentoRN extends InfraRN {
92	92	} catch (Exception $e) {
93	93	$objInfraIBanco->cancelarTransacao();
94	94	throw $e;
95		-
96	95	}
97	96	}
98	97	}
...	...