From 6e285d8e33c01b68565738fb4456c2caf9149bc3 Mon Sep 17 00:00:00 2001
From: Luciano Almeida <lucianoalmeida@interlegis.leg.br>
Date: Fri, 3 Mar 2017 16:11:05 -0300
Subject: [PATCH] Arruma model renomeada e diff do rebase

Signed-off-by: Luciano Almeida <lucianoalmeida@interlegis.leg.br>
---
 sapl/legacy/migration.py | 3 ++-
 sapl/norma/legacy.yaml   | 9 +++++----
 sapl/sessao/models.py    | 5 -----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/sapl/legacy/migration.py b/sapl/legacy/migration.py
index 1228252e9..82a14e70e 100644
--- a/sapl/legacy/migration.py
+++ b/sapl/legacy/migration.py
@@ -23,7 +23,8 @@ from sapl.materia.models import (Proposicao, StatusTramitacao, TipoDocumento,
                                  TipoMateriaLegislativa, TipoProposicao,
                                  Tramitacao)
 from sapl.legacy.models import Protocolo as ProtocoloLegado
-from sapl.norma.models import AssuntoNorma, NormaJuridica, VinculoNormaJuridica
+from sapl.norma.models import (AssuntoNorma, NormaJuridica,
+                               TipoVinculoNormaJuridica)
 from sapl.parlamentares.models import Parlamentar
 from sapl.protocoloadm.models import Protocolo, StatusTramitacaoAdministrativo
 from sapl.sessao.models import ExpedienteMateria, OrdemDia, SessaoPlenaria
diff --git a/sapl/norma/legacy.yaml b/sapl/norma/legacy.yaml
index 89038ef69..17a7f083d 100644
--- a/sapl/norma/legacy.yaml
+++ b/sapl/norma/legacy.yaml
@@ -42,7 +42,8 @@ LegislacaoCitada:
   subsecao: des_subsecao
   titulo: des_titulo
 
-VinculoNormaJuridica:
-  norma_referente: cod_norma_referente
-  norma_referida: cod_norma_referida
-  tipo_vinculo: tip_vinculo
+# TODO Descomentar quando a issue #832 for concluida
+# TipoVinculoNormaJuridica (VinculoNormaJuridica):
+#   norma_referente: cod_norma_referente
+#   norma_referida: cod_norma_referida
+#   tipo_vinculo: tip_vinculo
diff --git a/sapl/sessao/models.py b/sapl/sessao/models.py
index aab0e3850..e76f6392f 100644
--- a/sapl/sessao/models.py
+++ b/sapl/sessao/models.py
@@ -177,13 +177,8 @@ class SessaoPlenaria(models.Model):
     def save(self, force_insert=False, force_update=False, using=None,
              update_fields=None):
 
-<<<<<<< 0d281b8f594224dfa3ede0c7e6ccb32395bdfe42
-        if not self.pk and (self.upload_pauta or
-                            self.upload_ata or self.upload_anexo):
-=======
         if not self.pk and (self.upload_pauta or self.upload_ata or
                             self.upload_anexo):
->>>>>>> Migra usando django-reversion
             upload_pauta = self.upload_pauta
             upload_ata = self.upload_ata
             upload_anexo = self.upload_anexo