Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

caosdb-cpplib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c9360a7b

Verified Commit c9360a7b authored 2 years ago by Timm Fitschen

Downloads
- Patches
- Plain Diff

MAINT: fix merge conflicts

parent bd7a807e

Branches

Tags

2 merge requests!42Release 0.2.0,!28F async execute

Checking pipeline status

Changes 3
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

include/caosdb/logging.h 7 additions, 9 deletions

include/caosdb/logging.h
include/caosdb/transaction.h 15 additions, 14 deletions

include/caosdb/transaction.h
src/caosdb/transaction.cpp 2 additions, 2 deletions

src/caosdb/transaction.cpp

with 24 additions and 25 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment