From 2ce934c0d99933e90804fb19216ee44a7586f5e1 Mon Sep 17 00:00:00 2001 From: "Matias N. Goldberg" Date: Sat, 10 Jul 2021 19:52:33 -0300 Subject: [PATCH] Fix merge conflict with main branch Signed-off-by: Matias N. Goldberg --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4f7c85f4..b349f264e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(ignition-rendering5 VERSION 5.1.0) +project(ignition-rendering6 VERSION 6.0.0) #============================================================================ # Find ignition-cmake