correct merge typos and add columns to db

Authored by camiloh on Jul 14 2018, 1:35 PM.

Description

correct merge typos and add columns to db

Details

Committed
camilohJul 14 2018, 1:35 PM
Parents
R1008:5da6991f9881: solve merge issues
Branches
Unknown
Tags
Unknown