Diferenças
Aqui você vê as diferenças entre duas revisões dessa página.
Ambos lados da revisão anterior Revisão anterior Próxima revisão | Revisão anterior | ||
sistemas:suap:tags:ifrnmaster10052017 [2017/05/02 11:06] Antonio Rodrigo dos Santos Silva |
sistemas:suap:tags:ifrnmaster10052017 [2017/05/02 11:08] Antonio Rodrigo dos Santos Silva |
||
---|---|---|---|
Linha 17: | Linha 17: | ||
<WRAP prewrap> | <WRAP prewrap> | ||
< | < | ||
- | git checkout -b atualizacao_ifrn_10042017 | + | git checkout -b atualizacao_ifrn_05_2017 |
git remote add suapifrn http:// | git remote add suapifrn http:// | ||
</ | </ | ||
Linha 281: | Linha 281: | ||
< | < | ||
- | git merge 17.1 | + | git merge suapifrn/ |
</ | </ | ||
Linha 288: | Linha 288: | ||
<WRAP prewrap> | <WRAP prewrap> | ||
< | < | ||
+ | Auto-merging suap/ | ||
+ | CONFLICT (content): Merge conflict in suap/ | ||
+ | Auto-merging suap/ | ||
+ | CONFLICT (content): Merge conflict in suap/ | ||
Auto-merging suap/ | Auto-merging suap/ | ||
CONFLICT (content): Merge conflict in suap/ | CONFLICT (content): Merge conflict in suap/ | ||
Auto-merging rh/views.py | Auto-merging rh/views.py | ||
- | CONFLICT (content): Merge conflict in rh/views.py | ||
Auto-merging rh/ | Auto-merging rh/ | ||
CONFLICT (content): Merge conflict in rh/ | CONFLICT (content): Merge conflict in rh/ | ||
Auto-merging rh/ | Auto-merging rh/ | ||
- | CONFLICT (content): Merge conflict in rh/ | ||
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/ | Auto-merging protocolo/ | ||
Auto-merging protocolo/ | Auto-merging protocolo/ | ||
Auto-merging projetos/ | Auto-merging projetos/ | ||
- | CONFLICT (content): Merge conflict in projetos/ | ||
- | Auto-merging projetos/ | ||
- | Auto-merging projetos/ | ||
- | Auto-merging projetos/ | ||
- | Auto-merging projetos/ | ||
- | Auto-merging projetos/ | ||
Auto-merging projetos/ | Auto-merging projetos/ | ||
- | Auto-merging planejamento/ | + | Auto-merging ponto/ |
- | CONFLICT (content): Merge conflict in planejamento/ | + | CONFLICT (content): Merge conflict in ponto/ |
+ | Auto-merging ponto/ | ||
+ | Auto-merging ponto/ | ||
+ | Auto-merging ponto/ | ||
+ | Auto-merging planejamento/ | ||
+ | CONFLICT (content): Merge conflict in planejamento/ | ||
+ | Auto-merging planejamento/ | ||
+ | Auto-merging planejamento/ | ||
+ | Auto-merging planejamento/ | ||
+ | CONFLICT (content): Merge conflict in planejamento/ | ||
+ | Auto-merging planejamento/ | ||
+ | CONFLICT (content): Merge conflict in planejamento/ | ||
+ | Auto-merging patrimonio/ | ||
+ | CONFLICT (content): Merge conflict in patrimonio/ | ||
+ | Auto-merging patrimonio/ | ||
+ | Auto-merging patrimonio/ | ||
Auto-merging patrimonio/ | Auto-merging patrimonio/ | ||
+ | Auto-merging patrimonio/ | ||
+ | Auto-merging patrimonio/ | ||
+ | CONFLICT (content): Merge conflict in patrimonio/ | ||
+ | Auto-merging patrimonio/ | ||
+ | Auto-merging ldap_backend/ | ||
+ | Auto-merging frota/ | ||
+ | CONFLICT (content): Merge conflict in frota/ | ||
+ | Auto-merging frota/ | ||
Auto-merging frota/ | Auto-merging frota/ | ||
Auto-merging frota/ | Auto-merging frota/ | ||
CONFLICT (content): Merge conflict in frota/ | CONFLICT (content): Merge conflict in frota/ | ||
+ | Auto-merging frota/ | ||
+ | CONFLICT (content): Merge conflict in frota/ | ||
+ | Auto-merging financeiro/ | ||
Auto-merging etep/ | Auto-merging etep/ | ||
- | CONFLICT (content): Merge conflict in etep/ | ||
Auto-merging estagios/ | Auto-merging estagios/ | ||
Auto-merging estagios/ | Auto-merging estagios/ | ||
+ | Auto-merging edu/ | ||
+ | Auto-merging edu/ | ||
+ | CONFLICT (content): Merge conflict in edu/ | ||
Auto-merging djtools/ | Auto-merging djtools/ | ||
CONFLICT (content): Merge conflict in djtools/ | CONFLICT (content): Merge conflict in djtools/ | ||
+ | Auto-merging djtools/ | ||
Auto-merging djtools/ | Auto-merging djtools/ | ||
- | Auto-merging djtools/static/djtools/jquery/jquery.autocomplete.js | + | Auto-merging djtools/templates/adminutils/ |
+ | CONFLICT (content): Merge conflict in djtools/templates/adminutils/ | ||
+ | Auto-merging djtools/ | ||
+ | Removing djtools/ | ||
+ | Auto-merging djtools/ | ||
+ | CONFLICT (content): Merge conflict in djtools/ | ||
Auto-merging deploy/ | Auto-merging deploy/ | ||
CONFLICT (content): Merge conflict in deploy/ | CONFLICT (content): Merge conflict in deploy/ | ||
- | Auto-merging contratos/models.py | + | Auto-merging contratos/views.py |
- | CONFLICT (content): Merge conflict in contratos/models.py | + | Auto-merging contratos/ |
+ | CONFLICT (content): Merge conflict in contratos/admin.py | ||
+ | Auto-merging comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
+ | CONFLICT (content): Merge conflict in comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
+ | CONFLICT (content): Merge conflict in comum/ | ||
+ | Auto-merging comum/ | ||
+ | CONFLICT (content): Merge conflict in comum/ | ||
+ | Auto-merging comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
+ | CONFLICT (content): Merge conflict in comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
+ | Auto-merging comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
Auto-merging comum/ | Auto-merging comum/ | ||
- | CONFLICT (content): Merge conflict in comum/models.py | + | Auto-merging |
Auto-merging comum/ | Auto-merging comum/ | ||
- | Auto-merging | + | Auto-merging |
+ | CONFLICT (content): Merge conflict in comum/admin.py | ||
+ | Auto-merging chaves/ | ||
Auto-merging centralservicos/ | Auto-merging centralservicos/ | ||
CONFLICT (content): Merge conflict in centralservicos/ | CONFLICT (content): Merge conflict in centralservicos/ | ||
Linha 341: | Linha 384: | ||
Auto-merging centralservicos/ | Auto-merging centralservicos/ | ||
Auto-merging centralservicos/ | Auto-merging centralservicos/ | ||
+ | CONFLICT (content): Merge conflict in centralservicos/ | ||
Auto-merging centralservicos/ | Auto-merging centralservicos/ | ||
CONFLICT (content): Merge conflict in centralservicos/ | CONFLICT (content): Merge conflict in centralservicos/ | ||
- | Removing centralservicos/ | ||
- | CONFLICT (modify/ | ||
Auto-merging centralservicos/ | Auto-merging centralservicos/ | ||
+ | Auto-merging api/urls.py | ||
+ | CONFLICT (content): Merge conflict in api/urls.py | ||
+ | Removing api/ | ||
+ | Removing api/ | ||
+ | Removing api/ | ||
+ | Auto-merging almoxarifado/ | ||
+ | CONFLICT (content): Merge conflict in almoxarifado/ | ||
+ | Auto-merging almoxarifado/ | ||
+ | Auto-merging almoxarifado/ | ||
Auto-merging almoxarifado/ | Auto-merging almoxarifado/ | ||
CONFLICT (content): Merge conflict in almoxarifado/ | CONFLICT (content): Merge conflict in almoxarifado/ | ||
+ | Auto-merging almoxarifado/ | ||
+ | CONFLICT (content): Merge conflict in almoxarifado/ | ||
+ | Auto-merging almoxarifado/ | ||
+ | Auto-merging ae/ | ||
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. | ||
</ | </ |