From a9cf916b8224b3426693d6936ba3a11899b1acd8 Mon Sep 17 00:00:00 2001 From: Takatoshi Kondo Date: Mon, 27 Oct 2014 11:09:49 +0900 Subject: [PATCH] Solved conflicts on README.md. --- README.md | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README.md b/README.md index a1a55fae..934bd148 100644 --- a/README.md +++ b/README.md @@ -20,11 +20,7 @@ The source for msgpack-c is held at [msgpack-c](https://github.com/msgpack/msgpa To report an issue, use the [msgpack-c issue tracker](https://github.com/msgpack/msgpack-c/issues) at github.com. ## Version -<<<<<<< HEAD 0.5.9 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=master)](https://travis-ci.org/msgpack/msgpack-c) -======= -0.6.0 [![Build Status](https://travis-ci.org/msgpack/msgpack-c.svg?branch=poc/0.6)](https://travis-ci.org/msgpack/msgpack-c) ->>>>>>> 466986b5190ae8e03065e7b614702ec2f43dce1c ## Using Msgpack @@ -110,15 +106,6 @@ e.g.) tortoise git https://code.google.com/p/tortoisegit/ 1. Build all. - -<<<<<<< HEAD -or using GUI git client. -======= -#### Install from package ->>>>>>> 466986b5190ae8e03065e7b614702ec2f43dce1c - -Install from package for this branch (poc/0.6) is not supported yet. - ### Code Example #include