<<<<<<< HEAD
package org.wpattern.mutrack.simple.user;

import java.util.List;

import org.springframework.data.jpa.repository.JpaRepository;

public interface UserRepository extends JpaRepository<UserEntity, Long> {

	public List<UserEntity> findByEmailOrName(String email, String name);

}
=======
package org.wpattern.mutrack.simple.user;

import org.springframework.data.jpa.repository.JpaRepository;

public interface UserRepository extends JpaRepository<UserEntity, Long> {

	public UserEntity findByEmail(String email);
	
}
>>>>>>> 72c25ab37f178d67df6f8d065114f341db433030

@@ -1,17 +1,4 @@
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A
 pack
@@ -125,273 +125,8 @@
 ory;
-%0A%0Apublic interface UserRepository extends JpaRepository%3CUserEntity, Long%3E %7B%0A%0A%09public List%3CUserEntity%3E findByEmailOrName(String email, String name);%0A%0A%7D%0A=======%0Apackage org.wpattern.mutrack.simple.user;%0D%0A%0D%0Aimport org.springframework.data.jpa.repository.JpaRepository;
 %0D%0A%0D%0A
@@ -251,61 +251,82 @@
 il);
-%0D
+%0A
 %0A%09
+public List%3CUserEntity%3E findByEmailOrName(String email, String name);
 %0D%0A
-%7D
 %0D%0A
-%3E%3E%3E%3E%3E%3E%3E 72c25ab37f178d67df6f8d065114f341db433030
+%7D
 %0A

Create a new search.