Skip to content

Task006 Add Associates#19

Open
ghost wants to merge 5 commits intodevelopmentfrom
task006-AddAssociates
Open

Task006 Add Associates#19
ghost wants to merge 5 commits intodevelopmentfrom
task006-AddAssociates

Conversation

@ghost
Copy link

@ghost ghost commented Sep 1, 2017

Change User and Task Entity

# Conflicts:
#	pom.xml
#	src/main/java/io/khasang/teamnote/config/AppConfig.java
#	src/main/java/io/khasang/teamnote/controller/AppController.java
#	web/WEB-INF/views/checkSpell.jsp
# Conflicts:
#	pom.xml
#	src/main/java/io/khasang/teamnote/config/AppConfig.java
#	src/main/java/io/khasang/teamnote/controller/AppController.java
#	web/WEB-INF/views/checkSpell.jsp
Copy link
Collaborator

@MinniMause MinniMause left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please rename "perant" to "parent".

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