Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

asapo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

982cd05b

Commit 982cd05b authored 3 years ago by Juergen Hannappel

Downloads
- Plain Diff

fix merge conflict

parents 1772c20f 503266dd

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

consumer/api/c/include/asapo/consumer_c.h 15 additions, 16 deletions

consumer/api/c/include/asapo/consumer_c.h
consumer/api/cpp/src/consumer_c_glue.cpp 120 additions, 120 deletions

consumer/api/cpp/src/consumer_c_glue.cpp
examples/consumer/simple-consumer-c/consume.c 1 addition, 1 deletion

examples/consumer/simple-consumer-c/consume.c
examples/consumer/simple-consumer/consume.cpp 1 addition, 1 deletion

examples/consumer/simple-consumer/consume.cpp

with 137 additions and 138 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

imprint | privacy | Conditions of Use