mirror of
https://github.com/msgpack/msgpack-c.git
synced 2025-05-20 04:57:44 +02:00
Fixed merge mistake.
This commit is contained in:
parent
6771302f62
commit
1a97e761fb
@ -28,11 +28,8 @@ check_PROGRAMS = \
|
||||
reference \
|
||||
limit \
|
||||
json \
|
||||
<<<<<<< HEAD
|
||||
raw \
|
||||
=======
|
||||
user_class \
|
||||
>>>>>>> 584bd8575f6a1625b7b4bc60b279537c52236756
|
||||
iterator_cpp11 \
|
||||
boost_fusion \
|
||||
boost_optional \
|
||||
|
Loading…
x
Reference in New Issue
Block a user