Conflicts are fixed in: libraries/app/database_api.cpp libraries/app/include/graphene/app/database_api.hpp |
||
|---|---|---|
| .. | ||
| include/graphene/app | ||
| api.cpp | ||
| application.cpp | ||
| CMakeLists.txt | ||
| config_util.cpp | ||
| database_api.cpp | ||
| plugin.cpp | ||
Conflicts are fixed in: libraries/app/database_api.cpp libraries/app/include/graphene/app/database_api.hpp |
||
|---|---|---|
| .. | ||
| include/graphene/app | ||
| api.cpp | ||
| application.cpp | ||
| CMakeLists.txt | ||
| config_util.cpp | ||
| database_api.cpp | ||
| plugin.cpp | ||