Make use of my brain.

Klafyvel · Dec 26, 2019 · 4a36ab1 · 4a36ab1
1 parent 2700c86
commit 4a36ab1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/make.jl b/docs/make.jl
@@ -10,9 +10,5 @@ makedocs(
 )
 
 deploydocs(
-<<<<<<< Updated upstream
-    repo = "Klafyvel/Wavefronts.jl",
-=======
     repo = "github.com/Klafyvel/Wavefronts.jl.git",
->>>>>>> Stashed changes
 )