From 0ce52b8419854fcb84de817543ae3a21dca74873 Mon Sep 17 00:00:00 2001
From: Cesar Carvalho <cesaraugc@gmail.com>
Date: Mon, 3 Jun 2019 14:36:29 -0300
Subject: [PATCH] Cronometros da tela de sessao funcionando

---
 sapl/painel/urls.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sapl/painel/urls.py b/sapl/painel/urls.py
index fa54a96d4..b734f6813 100644
--- a/sapl/painel/urls.py
+++ b/sapl/painel/urls.py
@@ -3,16 +3,8 @@ from django.conf.urls import url, include
 from .apps import AppConfig
 from .views import (cronometro_painel, get_dados_painel, painel_mensagem_view,
                     painel_parlamentar_view, painel_view, painel_votacao_view,
-<<<<<<< HEAD
                     switch_painel, verifica_painel, votante_view, CronometroPainelCrud,
-<<<<<<< HEAD
                     PainelConfigCrud)
-=======
-                    TipoCronometroCrud)
->>>>>>> Fix #2828 - Adiciona tipo de cronômetro
-=======
-                    switch_painel, verifica_painel, votante_view, CronometroPainelCrud)
->>>>>>> Corrige migrações
 
 app_name = AppConfig.name