Skip to content

test pull request#1

Open
graybat21 wants to merge 294 commits intomasterKTJfrom
mastercommon
Open

test pull request#1
graybat21 wants to merge 294 commits intomasterKTJfrom
mastercommon

Conversation

@graybat21
Copy link
Owner

test

xorwnsnmnnhlba and others added 30 commits May 13, 2017 16:53
…o sunho

# Conflicts:
#	src/main/java/com/ustyle/domain/User.java
…to mastercommon

# Conflicts:
#	src/main/webapp/WEB-INF/views/include/header.jsp
#	src/test/java/com/ustyle/controller/DataSourceTest.java
…to mastercommon

# Conflicts:
#	src/main/java/com/ustyle/controller/HomeController.java
#	src/main/webapp/WEB-INF/views/include/header.jsp
if ( session.getAttribute("session_username") == null )
return "user/login/LOGIN";

public String updateForm() {
Copy link
Owner Author

Choose a reason for hiding this comment

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

test

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.

3 participants