resolved merge conflicts

This commit is contained in:
Jeremy Borgman
2021-01-15 17:58:43 -06:00
12 changed files with 165 additions and 85 deletions

View File

@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.13)
# cmake_policy(SET CMP0076 OLD)
set(FLAMESHOT_VERSION 0.8.5.6)
set(FLAMESHOT_VERSION 0.8.5)
# Flameshot-org
set(GIT_API_URL "https://api.github.com/repos/flameshot-org/flameshot/releases/latest")