From 2b2a2d93d919075e883fa4221a66a5f09b618c72 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 21 Jan 2024 23:37:23 +0000 Subject: [PATCH] Update readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 35cc2c3..bfc4ec1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -<<<<<<< HEAD -[![test](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml) [![lint](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml) [![release](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml) ![GitHub License](https://img.shields.io/github/license/codophobia/key-value-cache-thrift-python) -======= -[![test](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml) [![lint](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml) [![release](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml) ![GitHub License](https://img.shields.io/github/license/codophobia/key-value-cache-thrift-python) ![PyPI - Version](https://img.shields.io/pypi/v/thriftcacheserver) ->>>>>>> 86220bd (Update readme) +[![build-test](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/build-test.yaml) [![lint](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/lint.yaml) [![release](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml/badge.svg)](https://github.com/codophobia/key-value-cache-thrift-python/actions/workflows/release.yaml) ![GitHub License](https://img.shields.io/github/license/codophobia/key-value-cache-thrift-python) ![PyPI - Version](https://img.shields.io/pypi/v/thriftcacheserver) ## key-value-cache-thrift-python Implement a simple key value cache using thrift and Python