forked from qt-creator/qt-creator
Don't create QObject instance when handling conflicts. Operate on static functions only. Replace destructor of ConflictHandler with finalize() method. Change-Id: If579edc6213faa50c73a90cedf4b67cf985478ac Reviewed-by: Orgad Shaneh <orgads@gmail.com>
149 KiB
149 KiB