Skip to content

Commit 251ef3d

Browse files
committed
Merge branch 'develop' of github.com:metacall/core into develop
2 parents 5964dd6 + ded829b commit 251ef3d

File tree

1 file changed

+0
-4
lines changed
  • source/ports/scala_port/src/main/scala

1 file changed

+0
-4
lines changed

source/ports/scala_port/src/main/scala/Ptr.scala

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@ package metacall
22

33
import metacall.util._
44
import com.sun.jna._
5-
<<<<<<< HEAD
65
import cats.implicits._
7-
=======
8-
import cats._, cats.implicits._, cats.effect._
9-
>>>>>>> Solving some Scala port bugs and trying to implement support for multiple arguments.
106

117
/** Create a [[Ptr]] to MetaCall value of type [[A]] */
128
trait Create[A] {

0 commit comments

Comments
 (0)