Skip to content

Pdi report2#89

Merged
aperdec merged 3 commits into
developfrom
pdiReport2
Oct 6, 2016
Merged

Pdi report2#89
aperdec merged 3 commits into
developfrom
pdiReport2

Conversation

@Elviis
Copy link
Copy Markdown
Collaborator

@Elviis Elviis commented Oct 6, 2016

No description provided.

Elviis and others added 3 commits October 6, 2016 13:24
# Conflicts:
#	WebContent/WEB-INF/jsps/home.jsp
#	src/ca/sheridancollege/services/ControllerServices.java
#	target/classes/ca/sheridancollege/beans/Form.class
#	target/classes/ca/sheridancollege/config/security-context.xml
#	target/classes/ca/sheridancollege/controllers/HomeController.class
#	target/classes/ca/sheridancollege/dao/DAO.class
@aperdec aperdec merged commit b4b0503 into develop Oct 6, 2016
@aperdec aperdec deleted the pdiReport2 branch October 7, 2016 14:30
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