snooty

Author: lindseymoore

snooty.toml

@@ -28,10 +28,4 @@ version = "v{+version-number+}"
 mdb-server = "MongoDB Server"
 stable-api = "Stable API"
 api = "https://mongodb.github.io/mongo-java-driver/{+version-number+}/apidocs/mongodb-driver-kotlin-sync"
-<<<<<<< HEAD
 core-api = "https://mongodb.github.io/mongo-java-driver/{+version-number+}/apidocs/mongodb-driver-core/com/mongodb"
-=======
-java-api = "https://mongodb.github.io/mongo-java-driver/{+version-number+}"
-core-api = "{+java-api+}/apidocs/mongodb-driver-core/"
-kotlin-docs = "https://kotlinlang.org"
->>>>>>> refs/remotes/upstream/master