Skip to content

Add my info to the array#69

Open
Zegelink wants to merge 3 commits intocs361-W16:masterfrom
Zegelink:master
Open

Add my info to the array#69
Zegelink wants to merge 3 commits intocs361-W16:masterfrom
Zegelink:master

Conversation

@Zegelink
Copy link
Copy Markdown

No description provided.

# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/workspace.xml
#	Assignment0/src/main/java/controllers/ApplicationController.java
# Conflicts:
#	.idea/compiler.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/workspace.xml
#	Assignment0/src/main/java/controllers/ApplicationController.java
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.

1 participant