Skip to content

Commit d35ec61

Browse files
committed
Fix merge error
Signed-off-by: currantw <taylor.curran@improving.com>
1 parent 291500a commit d35ec61

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

DEVELOPER.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ The C# client contains the following parts:
1111
1. Rust part of the C# client located in `rust/src`; it communicates with [GLIDE core rust library](/valkey-glide/glide-core/README.md).
1212
2. C# part of the client located in `sources`; it translates Rust async API into .NET async API.
1313
3. Tests for the C# client located in `tests` directory.
14-
<<<<<<< HEAD
15-
4. A dedicated benchmarking tool designed to evaluate and compare the performance of Valkey GLIDE and other .NET clients. It is located in `/benchmarks`.
16-
=======
17-
TODO: examples, UT, design docs
18-
>>>>>>> 8c80e1aeac9a7fdc92da55576ddfb5f66975140b
1914

2015
## Build from Source
2116

0 commit comments

Comments
 (0)