Merge branch 'develop' of github.com:metacall/core into develop

metacall · Jan 29, 2021 · 251ef3d · 251ef3d
2 parents 5964dd6 + ded829b
commit 251ef3d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/source/ports/scala_port/src/main/scala/Ptr.scala b/source/ports/scala_port/src/main/scala/Ptr.scala
@@ -2,11 +2,7 @@ package metacall
 
 import metacall.util._
 import com.sun.jna._
-<<<<<<< HEAD
 import cats.implicits._
-=======
-import cats._, cats.implicits._, cats.effect._
->>>>>>> Solving some Scala port bugs and trying to implement support for multiple arguments.
 
 /** Create a [[Ptr]] to MetaCall value of type [[A]] */
 trait Create[A] {