Skip to content

Dev#4

Open
GERONlMO wants to merge 3 commits intoGERONlMO:Devfrom
FirewallGR:Dev
Open

Dev#4
GERONlMO wants to merge 3 commits intoGERONlMO:Devfrom
FirewallGR:Dev

Conversation

@GERONlMO
Copy link
Copy Markdown
Owner

No description provided.

# Conflicts:
#	JavaCreditest/src/main/java/ru/meowmure/javacreditest/Controllers/GUIController.java
#	JavaCreditest/src/main/java/ru/meowmure/javacreditest/Controllers/ItemController.java
#	JavaCreditest/src/main/resources/ru/meowmure/javacreditest/NewItem.fxml
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