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

Cringe draft: devtest test merge thing #444

Closed
wants to merge 2 commits into from
Closed

Cringe draft: devtest test merge thing #444

wants to merge 2 commits into from

Conversation

Furrior
Copy link

@Furrior Furrior commented Oct 15, 2023

ПР чтоб удобно затестмержить девтест в тгс

@github-actions github-actions bot added :neckbeard: Документация Улучшения и дополнения в документации TGUI Кто-то решил потрогать интерфейсы. Merge Conflict Ну блять... and removed Merge Conflict Ну блять... :neckbeard: Документация Улучшения и дополнения в документации labels Oct 15, 2023
@SS220Manager
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Paradise

Revision

Origin: 3e12658
Pull Request: 6b59c31
Server: d1e59910ad3c80027a9f12890c0fbaa2172e1822

Comment

@larentoun
Copy link
Collaborator

Нет конфликтов :Pog:

@SS220Manager
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

Paradise

Revision

Origin: a0e8624
Pull Request: 6b59c31
Server: 358f38accab91f3a6c7db8eb409dff8ee963cc4c

Comment

@github-actions github-actions bot added Merge Conflict Ну блять... and removed Merge Conflict Ну блять... labels Oct 21, 2023
@github-actions github-actions bot added the :neckbeard: Документация Улучшения и дополнения в документации label Oct 22, 2023
@Furrior
Copy link
Author

Furrior commented Oct 22, 2023

Хм

@Furrior
Copy link
Author

Furrior commented Oct 22, 2023

Ветка в говно

@Furrior
Copy link
Author

Furrior commented Oct 22, 2023

Странно, на самом деле. Надо будет чинить.

@github-actions github-actions bot added the Merge Conflict Ну блять... label Nov 2, 2023
@Furrior Furrior closed this Nov 3, 2023
@AyIong
Copy link
Collaborator

AyIong commented Nov 3, 2023

Починил xdd

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge Conflict Ну блять... :neckbeard: Документация Улучшения и дополнения в документации TGUI Кто-то решил потрогать интерфейсы.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants