From b6410df10adf916fd2919297a21438dbfbf73483 Mon Sep 17 00:00:00 2001
From: hzmnet <johan@ryron.net>
Date: Tue, 3 Nov 2015 01:26:19 +0800
Subject: [PATCH] ads

---
 session.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/session.go b/session.go
index a8824e28..e65b9c9f 100644
--- a/session.go
+++ b/session.go
@@ -1540,7 +1540,10 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
 				sliceValue.SetMapIndex(reflect.ValueOf(key), reflect.Indirect(reflect.ValueOf(newValue.Interface())))
 			}
 		}
+<<<<<<< HEAD
 
+=======
+>>>>>>> parent of 24f47dd... Add FindMap
 	}
 	return nil
 }