Permalink
Browse files

Fixed merge conflicts

  • Loading branch information...
cdevroe committed Sep 18, 2017
2 parents aedbc5e + 03731c8 commit e37f73411a6ed3562959f6598feea01cb4d05557
@@ -11,7 +11,7 @@ public function __construct()
public function up()
{
// Add column to track when a mark was archived
$this->dbforge->add_column('users_marks', array('datearchived' => array('type'=>'timestamp default current_timestamp')));
$this->dbforge->add_column('users_marks', array('datearchived' => array('type'=>'timestamp')));
}
public function down()
View

Large diffs are not rendered by default.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit e37f734

Please sign in to comment.