didn't save

CairoMakie/Project.toml

@@ -1,11 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <[email protected]>"]
-<<<<<<< HEAD
 version = "0.11.0"
-=======
-version = "0.10.11"
->>>>>>> master
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -27,11 +23,7 @@ FFTW = "1"
 FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.4.1"
-<<<<<<< HEAD
 Makie = "=0.20.0"
-=======
-Makie = "=0.19.11"
->>>>>>> master
 PrecompileTools = "1.0"
 julia = "1.3"
 

GLMakie/Project.toml

@@ -1,10 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-<<<<<<< HEAD
 version = "0.9.0"
-=======
-version = "0.8.11"
->>>>>>> master
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -33,11 +29,7 @@ FixedPointNumbers = "0.7, 0.8"
 FreeTypeAbstraction = "0.10"
 GLFW = "3.3"
 GeometryBasics = "0.4.1"
-<<<<<<< HEAD
 Makie = "=0.20.0"
-=======
-Makie = "=0.19.11"
->>>>>>> master
 MeshIO = "0.4"
 ModernGL = "1"
 Observables = "0.5.1"

RPRMakie/Project.toml

@@ -1,11 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-<<<<<<< HEAD
 version = "0.6.0"
-=======
-version = "0.5.11"
->>>>>>> master
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -21,11 +17,7 @@ julia = "1.3"
 Colors = "0.9, 0.10, 0.11, 0.12"
 FileIO = "1.6"
 GeometryBasics = "0.4.1"
-<<<<<<< HEAD
 Makie = "=0.20.0"
-=======
-Makie = "=0.19.11"
->>>>>>> master
 RadeonProRender = "0.3.0"
 
 [extras]