1

src/cn/compass/entity/AccountMst.inc

 <?php
 /**
  * AccountMst Entity
-<<<<<<< HEAD
  * $Id: AccountMst.inc,v 1.1 2020/2/13 10:54:23 Exp $
-=======
- * $Id: AccountMst.inc,v 1.1 2020/2/13 11:17:48 Exp $
->>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
  * @author lixq
  * @package jp.compass.entity
  * @access public

src/cn/compass/entity/CourseMst.inc

@@ -25,25 +25,12 @@ class CourseMst extends CompassDynamicData
 	{
 		parent::constructor($record);
 
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
 		$this->parent_category_id = $record["parent_category_id"];
 		$this->sub_category_id    = $record["sub_category_id"];
 		$this->title              = $record["title"];
 		$this->front_image        = $record["front_image"];
 		$this->teacher_profile    = $record["teacher_profile"];
 		$this->delete_flg         = $record["delete_flg"];
-<<<<<<< HEAD
-=======
-=======
-		$this->title           = $record["title"];
-		$this->front_image     = $record["front_image"];
-		$this->teacher_profile = $record["teacher_profile"];
-		$this->delete_flg      = $record["delete_flg"];
->>>>>>> 78541f4f058325eb06d6076d532ac125befc77d0
->>>>>>> eb3e8ee3acfddebcb6320578b220a01256ab4ab3
 	}
 
 	/**