fix merge conflicts

2016-03-09 20:24:31 +01:00
parent 0f973170d2 b51028ab1d
commit 8f85d99a0a
40 changed files with 1800 additions and 23 deletions
--- a/common/models/Transfer.php
+++ b/common/models/Transfer.php
@@ -927,6 +927,7 @@ class Transfer extends \common\models\BaseFitnessActiveRecord {
 				] );
 			}
 			
+			
 			// storno contract					
 			
 		} else if ($this->type == Transfer::TYPE_PRODUCT) {