generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-20 13:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Fixed merge mistake.

Browse Source
This commit is contained in:
Takatoshi Kondo 2015-07-06 16:00:06 +09:00
parent 6771302f62
commit 1a97e761fb
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/Makefile.am
View File

@ -28,11 +28,8 @@ check_PROGRAMS = \
reference \ reference \
limit \ limit \
json \ json \
<<<<<<< HEAD
raw \ raw \
=======
user_class \ user_class \
>>>>>>> 584bd8575f6a1625b7b4bc60b279537c52236756
iterator_cpp11 \ iterator_cpp11 \
boost_fusion \ boost_fusion \
boost_optional \ boost_optional \