MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [merge issue] resolved merge issue

pull/3725/head
iglocska 2018-09-10 22:23:55 +02:00
parent bef577ae07
commit 8bc7e9b91f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Model/AppModel.php
View File

@ -69,11 +69,8 @@ class AppModel extends Model
public $db_changes = array(
1 => false, 2 => false, 3 => false, 4 => true, 5 => false, 6 => false,
7 => false, 8 => false, 9 => false, 10 => false, 11 => false, 12 => false,
<<<<<<< HEAD
13 => false, 14 => false, 15 => false, 18 => false, 19 => false, 20 => false
=======
13 => false, 14 => false, 15 => false, 16 => false, 17 => false, 21 => false
>>>>>>> feature/variable_tag_value
13 => false, 14 => false, 15 => false, 18 => false, 19 => false, 20 => false,
21 => false
);
public function afterSave($created, $options = array())