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

Patch 2 #34

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Patch 2 #34

wants to merge 2 commits into from

Conversation

Semisonic
Copy link
Contributor

No description provided.

общие слова про Госуслуги
@imShara
Copy link
Owner

imShara commented Jul 4, 2013

Реквест появился, но выполнить не могу
#34
We can’t automatically merge this pull request.
Use the command line to resolve conflicts before continuing.

выполнение команд пока не привело к положительному результату

@Semisonic
Copy link
Contributor Author

Да, там нужно было ручками разруливать мерж, потому что между моим первым и вторым патчами roi.txt был заменён на версию из коммита wersoo.
Но щас вроде всё в порядке.

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.

2 participants