Fix connect merge problems
Vicențiu Ciorbaru authored
* CMakeLists.txt erroneous duplicated lines.
* Unneded differences in tabjson.cpp
* Unneded space differences in jdbconn.{cpp|h}
b2c0cca6