* Delete unused code.

db/update17.5.sql

@@ -261,4 +261,3 @@ UPDATE `zt_grouppriv` SET `module` = 'product' WHERE `module` = 'story' and `met
 
 ALTER TABLE `zt_job` ADD `lastSyncDate` datetime DEFAULT NULL AFTER `lastTag`;
 INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('*/5', '*', '*', '*', '*', 'moduleName=compile&methodName=syncCompile', '定时同步构建记录', 'zentao', 1, 'normal', '0000-00-00 00:00:00');
->>>>>>> master

module/story/model.php

@@ -709,7 +709,6 @@ class storyModel extends model
             ->remove('files,labels,reviewer,comment,needNotReview,uid')
             ->get();
 
-
         $story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->change['id'], $this->post->uid);
         $this->dao->update(TABLE_STORY)->data($story, 'spec,verify')
             ->autoCheck()

module/story/test.php

@@ -1,5 +0,0 @@
-<?php
-$a = array('1', '2', '3');
-$b = array('1', '3');
-
-echo var_dump(array_diff($b, $a));