Revert "ads"

This reverts commit b6410df10a.
2015-11-03 01:26:24 +08:00 · 2015-11-03 01:26:24 +08:00 · e069ded383
parent b6410df10a
commit e069ded383
1 changed files with 0 additions and 3 deletions
--- a/session.go
+++ b/session.go
@ -1540,10 +1540,7 @@ 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
 }