From 0b46ae67c45957eae1524e6f5f4554a9b3efa3f3 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 | 4 ++++ setup.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d06bf31..35cc2c3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< 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) ## key-value-cache-thrift-python Implement a simple key value cache using thrift and Python diff --git a/setup.py b/setup.py index de4627c..477ebd8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='thriftcacheserver', - version='1.3', + version='1.4', description='A cache server using thrift', url='https://github.com/codophobia/key-value-cache-thrift-python', entry_points={