build problems. this looks like a merge conflict.

This commit is contained in:
Enno Rehling 2018-03-04 18:21:00 +01:00
parent 6c0f8a81f6
commit f997ff7e59

View file

@ -18,6 +18,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#ifndef HEADER_MUSEUM_H
#define HEADER_MUSEUM_H
#ifdef __cplusplus
extern "C" {
#endif