Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adequação ao modelo padrão sugerido pelos correios #28

Merged
merged 2 commits into from
Jan 7, 2016
Merged

Adequação ao modelo padrão sugerido pelos correios #28

merged 2 commits into from
Jan 7, 2016

Conversation

rafaelsiqueira
Copy link
Contributor

Geração das etiquetas seguindo padrão sugerido pelos correios; Utilizando medidas em milímetros e tamanho de folha padrão 100x140; Pequenas melhorias gerais;

…ando medidas em milímetros e tamanho de folha padrão 100x140; Pequenas melhorias gerais;
@stavarengo
Copy link
Owner

@rafaelsiqueira o PR está conflitando com a master.
Consegue atualizar sua branch sobre a master antes de fazer o merge?

@rafaelsiqueira
Copy link
Contributor Author

Feito.

Conflicts:
	src/PhpSigep/Pdf/CartaoDePostagem.php
stavarengo added a commit that referenced this pull request Jan 7, 2016
Adequação ao modelo padrão sugerido pelos correios
@stavarengo stavarengo merged commit 4c853ef into stavarengo:master Jan 7, 2016
@stavarengo
Copy link
Owner

Fixed #22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants