diff --git a/README.md b/README.md index 0a5af8fdb04f0976fccd10b71f765402bfe85f1c..37ac86533fe2f93a435355dd3e0e3b85ed76087d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ III# Usage ``` cmake_minimum_required(VERSION 3.0) -12332123213 +<<<<<<< HEAD +2021-7-8 +======= +12332123213dfgfg +>>>>>>> cbe1448b17f4d0f545e3ec21ef7f400d14991864 project(xx C) add_subdirectory(ssl)