Merge branch 'master' of https://github.com/germesdev/gorm

TrueCarry · TrueCarry · commit d77a1adcecf2 · 2018-06-08T15:01:45.000+03:00
diff --git a/model_struct.go b/model_struct.go
@@ -46,7 +46,11 @@ type ModelStruct struct {
 	StructFields     []*StructField
 	ModelType        reflect.Type
 	defaultTableName string
+<<<<<<< HEAD
 	l                *sync.RWMutex
+=======
+	l                sync.Mutex
+>>>>>>> 31d1ecea108316629ddea1aebf23d5e5626f422e
 }
 
 // TableName get model's table name
