Fix merge conflict in CMakeLists.txt

Author: oshkines

.github/workflows/release.yml

@@ -3,9 +3,10 @@ name: 'C++ CI'
 on:
   push:
     branches:
+      - main
       - master
       - feature/github_actions 
-
+  workflow_dispatch:
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,6 +17,7 @@ jobs:
       - run: sudo apt-get update && sudo apt-get install libboost-test-dev -y
       - run: cmake . -DPATCH_VERSION=${{ github.run_number }} -DWITH_BOOST_TEST=ON
       - run: cmake --build .
+      # временно закоментировал
       - run: cmake --build . --target test
       - run: cmake --build . --target package
       - name: Create Release