fix merge

Author: ffreyer

CairoMakie/Project.toml

@@ -1,11 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <sdanisch@gmail.com>"]
-<<<<<<< ff/breaking-0.25
 version = "0.16.0"
-=======
-version = "0.15.9"
->>>>>>> master
 
 [deps]
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
@@ -31,10 +27,6 @@ FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
-=======
-Makie = "=0.24.9"
->>>>>>> master
 PrecompileTools = "1.0"
 julia = "1.3"

GLMakie/Project.toml

@@ -1,10 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-<<<<<<< ff/breaking-0.25
 version = "0.14.0"
-=======
-version = "0.13.9"
->>>>>>> master
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -37,11 +33,7 @@ FreeTypeAbstraction = "0.10"
 GLFW = "3.4.3"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
-=======
-Makie = "=0.24.9"
->>>>>>> master
 Markdown = "1.0, 1.6"
 MeshIO = "0.5"
 ModernGL = "1"

Makie/Project.toml

@@ -1,11 +1,7 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
-<<<<<<< ff/breaking-0.25
 version = "0.25.0"
-=======
-version = "0.24.9"
->>>>>>> master
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"

RPRMakie/Project.toml

@@ -1,11 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-<<<<<<< ff/breaking-0.25
 version = "0.11.0"
-=======
-version = "0.10.9"
->>>>>>> master
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -24,11 +20,7 @@ Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
 FileIO = "1.6"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-<<<<<<< ff/breaking-0.25
 Makie = "=0.25.0"
-=======
-Makie = "=0.24.9"
->>>>>>> master
 Printf = "1.0, 1.6"
 RadeonProRender = "0.3.2"
 julia = "1.3"