From 2907d0cb9fd535155a46144dbcff447ab495d77c Mon Sep 17 00:00:00 2001
From: Johann Latocha
Date: Thu, 5 Jul 2012 13:39:31 +0200
Subject: add merge

---
 src/main/java/nu/xss/jpa/dao/Dao.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main/java/nu/xss/jpa/dao/Dao.java')

diff --git a/src/main/java/nu/xss/jpa/dao/Dao.java b/src/main/java/nu/xss/jpa/dao/Dao.java
index 18d886f..2c541c9 100644
--- a/src/main/java/nu/xss/jpa/dao/Dao.java
+++ b/src/main/java/nu/xss/jpa/dao/Dao.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 public interface Dao<E, K> {
     void save(E entity);
+    void merge(E entity);
     void delete(E entity);
     E findById(K id);
     List<E> findAll();
-- 
cgit v1.2.3-55-g7522