Fix merge conflict with main branch

Signed-off-by: Matias N. Goldberg <dark_sylinc@yahoo.com.ar>
gazebosim · Jul 10, 2021 · 2ce934c · 2ce934c
1 parent 5d396f6
commit 2ce934c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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