sistemas:suap:tags:ifrnmaster10052017

Diferenças

Aqui você vê as diferenças entre duas revisões dessa página.

Link para esta página de comparações

Ambos lados da revisão anterior Revisão anterior
Próxima revisão 		Revisão anterior
sistemas:suap:tags:ifrnmaster10052017 [2017/05/02 11:07]
Antonio Rodrigo dos Santos Silva 		sistemas:suap:tags:ifrnmaster10052017 [2021/08/25 10:33] (atual)
Linha 288: Linha 288:
 <WRAP prewrap> <WRAP prewrap>
 <code> <code>
 +Auto-merging suap/urls.py
 +CONFLICT (content): Merge conflict in suap/urls.py
 +Auto-merging suap/settings_sample.py
 +CONFLICT (content): Merge conflict in suap/settings_sample.py
 Auto-merging suap/settings_base.py Auto-merging suap/settings_base.py
 CONFLICT (content): Merge conflict in suap/settings_base.py CONFLICT (content): Merge conflict in suap/settings_base.py
 Auto-merging rh/views.py Auto-merging rh/views.py
-CONFLICT (content): Merge conflict in rh/views.py 
 Auto-merging rh/permissions.xml Auto-merging rh/permissions.xml
 CONFLICT (content): Merge conflict in rh/permissions.xml CONFLICT (content): Merge conflict in rh/permissions.xml
 Auto-merging rh/importador.py Auto-merging rh/importador.py
-CONFLICT (content): Merge conflict in rh/importador.py 
 Auto-merging rh/forms.py Auto-merging rh/forms.py
 CONFLICT (content): Merge conflict in rh/forms.py CONFLICT (content): Merge conflict in rh/forms.py
 +Auto-merging rh/admin.py
 +CONFLICT (content): Merge conflict in rh/admin.py
 Auto-merging protocolo/views.py Auto-merging protocolo/views.py
 Auto-merging protocolo/models.py Auto-merging protocolo/models.py
 Auto-merging projetos/views.py Auto-merging projetos/views.py
-CONFLICT (content): Merge conflict in projetos/views.py 
-Auto-merging projetos/templates/relatorio_projeto.html 
-Auto-merging projetos/templates/plano_trabalho_participante.html 
-Auto-merging projetos/templates/imprimir_projeto.html 
-Auto-merging projetos/templates/emitir_declaracao_orientacao_pdf.html 
-Auto-merging projetos/templates/emitir_certificado_extensao_pdf.html 
 Auto-merging projetos/forms.py Auto-merging projetos/forms.py
-Auto-merging planejamento/models.py +Auto-merging ponto/views.py 
-CONFLICT (content): Merge conflict in planejamento/models.py+CONFLICT (content): Merge conflict in ponto/views.py 
 +Auto-merging ponto/urls.py 
 +Auto-merging ponto/permissions.xml 
 +Auto-merging ponto/forms.py 
 +Auto-merging planejamento/views.py 
 +CONFLICT (content): Merge conflict in planejamento/views.py 
 +Auto-merging planejamento/tests.py 
 +Auto-merging planejamento/templates/relatorio/acoes_recurso_dimensao_unidade.html 
 +Auto-merging planejamento/forms.py 
 +CONFLICT (content): Merge conflict in planejamento/forms.py 
 +Auto-merging planejamento/admin.py 
 +CONFLICT (content): Merge conflict in planejamento/admin.py 
 +Auto-merging patrimonio/views.py 
 +CONFLICT (content): Merge conflict in patrimonio/views.py 
 +Auto-merging patrimonio/templates/inventario.html 
 +Auto-merging patrimonio/relatorio.py
 Auto-merging patrimonio/models.py Auto-merging patrimonio/models.py
 +Auto-merging patrimonio/management/commands/patrimonio_depreciar_inventarios.py
 +Auto-merging patrimonio/forms.py
 +CONFLICT (content): Merge conflict in patrimonio/forms.py
 +Auto-merging patrimonio/admin.py
 +Auto-merging ldap_backend/models.py
 +Auto-merging frota/views.py
 +CONFLICT (content): Merge conflict in frota/views.py
 +Auto-merging frota/permissions.xml
 Auto-merging frota/models.py Auto-merging frota/models.py
 Auto-merging frota/forms.py Auto-merging frota/forms.py
 CONFLICT (content): Merge conflict in frota/forms.py CONFLICT (content): Merge conflict in frota/forms.py
 +Auto-merging frota/admin.py
 +CONFLICT (content): Merge conflict in frota/admin.py
 +Auto-merging financeiro/importador.py
 Auto-merging etep/perms.py Auto-merging etep/perms.py
-CONFLICT (content): Merge conflict in etep/perms.py 
 Auto-merging estagios/models.py Auto-merging estagios/models.py
 Auto-merging estagios/forms.py Auto-merging estagios/forms.py
 +Auto-merging edu/q_academico.py
 +Auto-merging edu/perms.py
 +CONFLICT (content): Merge conflict in edu/perms.py
 Auto-merging djtools/utils.py Auto-merging djtools/utils.py
 CONFLICT (content): Merge conflict in djtools/utils.py CONFLICT (content): Merge conflict in djtools/utils.py
 +Auto-merging djtools/templatetags/tags.py
 Auto-merging djtools/templatetags/filters.py Auto-merging djtools/templatetags/filters.py
-Auto-merging djtools/static/djtools/jquery/jquery.autocomplete.js+Auto-merging djtools/templates/adminutils/change_list.html 
 +CONFLICT (content): Merge conflict in djtools/templates/adminutils/change_list.html 
 +Auto-merging djtools/forms/__init__.py 
 +Removing djtools/extra/captcha/tests.py 
 +Auto-merging djtools/adminutils.py 
 +CONFLICT (content): Merge conflict in djtools/adminutils.py
 Auto-merging deploy/requirements.txt Auto-merging deploy/requirements.txt
 CONFLICT (content): Merge conflict in deploy/requirements.txt CONFLICT (content): Merge conflict in deploy/requirements.txt
-Auto-merging contratos/models.py +Auto-merging contratos/views.py 
-CONFLICT (content): Merge conflict in contratos/models.py+Auto-merging contratos/admin.py 
 +CONFLICT (content): Merge conflict in contratos/admin.py 
 +Auto-merging comum/webservice.py
 Auto-merging comum/views.py Auto-merging comum/views.py
 +CONFLICT (content): Merge conflict in comum/views.py
 Auto-merging comum/utils.py Auto-merging comum/utils.py
 +CONFLICT (content): Merge conflict in comum/utils.py
 +Auto-merging comum/urls.py
 +CONFLICT (content): Merge conflict in comum/urls.py
 +Auto-merging comum/templates/login.html
 Auto-merging comum/templates/index.html Auto-merging comum/templates/index.html
 +CONFLICT (content): Merge conflict in comum/templates/index.html
 Auto-merging comum/templates/admin/base.html Auto-merging comum/templates/admin/base.html
 +Auto-merging comum/static/comum/css/login.css
 Auto-merging comum/static/comum/css/estilo.css Auto-merging comum/static/comum/css/estilo.css
 Auto-merging comum/models.py Auto-merging comum/models.py
-CONFLICT (content): Merge conflict in comum/models.py+Auto-merging comum/importador.py
 Auto-merging comum/forms.py Auto-merging comum/forms.py
-Auto-merging cnpq/migrations/0011_registropatente_curriculo.py+Auto-merging comum/admin.py 
 +CONFLICT (content): Merge conflict in comum/admin.py 
 +Auto-merging chaves/views.py
 Auto-merging centralservicos/views.py Auto-merging centralservicos/views.py
 CONFLICT (content): Merge conflict in centralservicos/views.py CONFLICT (content): Merge conflict in centralservicos/views.py
Linha 341: Linha 384:
 Auto-merging centralservicos/templates/selecionar_servico_abertura_chamado.html Auto-merging centralservicos/templates/selecionar_servico_abertura_chamado.html
 Auto-merging centralservicos/models.py Auto-merging centralservicos/models.py
 +CONFLICT (content): Merge conflict in centralservicos/models.py
 Auto-merging centralservicos/forms.py Auto-merging centralservicos/forms.py
 CONFLICT (content): Merge conflict in centralservicos/forms.py CONFLICT (content): Merge conflict in centralservicos/forms.py
-Removing centralservicos/fixtures/servicos_ifrn.json 
-CONFLICT (modify/delete): centralservicos/fixtures/homologacao.json deleted in 17.1 and modified in HEAD. Version HEAD of centralservicos/fixtures/homologacao.json left in tree. 
 Auto-merging centralservicos/admin.py Auto-merging centralservicos/admin.py
 +Auto-merging api/urls.py
 +CONFLICT (content): Merge conflict in api/urls.py
 +Removing api/templates/rest_framework_swagger/menu.html
 +Removing api/templates/rest_framework_swagger/header.html
 +Removing api/templates/rest_framework_swagger/head.html
 +Auto-merging almoxarifado/views.py
 +CONFLICT (content): Merge conflict in almoxarifado/views.py
 +Auto-merging almoxarifado/templates/tela_requisicao_detalhe.html
 +Auto-merging almoxarifado/relatorio.py
 Auto-merging almoxarifado/models.py Auto-merging almoxarifado/models.py
 CONFLICT (content): Merge conflict in almoxarifado/models.py CONFLICT (content): Merge conflict in almoxarifado/models.py
 +Auto-merging almoxarifado/migrations/0007_corrigir_valor_medio.py
 +CONFLICT (content): Merge conflict in almoxarifado/migrations/0007_corrigir_valor_medio.py
 +Auto-merging almoxarifado/forms.py
 +Auto-merging ae/webservice.py
 Auto-merging ae/views.py Auto-merging ae/views.py
 +CONFLICT (content): Merge conflict in ae/views.py
 +Auto-merging .gitignore
 +CONFLICT (content): Merge conflict in .gitignore
 Automatic merge failed; fix conflicts and then commit the result. Automatic merge failed; fix conflicts and then commit the result.
 </code> </code>
  • sistemas/suap/tags/ifrnmaster10052017.1493734048.txt.gz
  • Última modificação: 2021/08/25 10:33
  • (edição externa)