( ^ ʖ ^)

Comment/comment.go

@@ -1,11 +1,7 @@
 package Comment
 
 import (
-<<<<<<< HEAD
-	//guuid "github.com/google/uuid"
-=======
 	"github.com/nspcc-dev/neo-go/pkg/interop/native/oracle"
->>>>>>> oracle_uuid
 	"github.com/nspcc-dev/neo-go/pkg/interop/native/std"
 	"github.com/nspcc-dev/neo-go/pkg/interop/runtime"
 	"github.com/nspcc-dev/neo-go/pkg/interop/storage"
@@ -24,11 +20,7 @@ func CreateNewComment(authorId string, postId string, text string) {
 	ctx := storage.GetContext()
 
 	newComment := Comment{
-<<<<<<< HEAD
-		id:       "1", // guuid.New().String(),
-=======
 		id:       "none",
->>>>>>> oracle_uuid
 		authorId: authorId,
 		postId:   postId,
 		text:     text,

Post/post.yml

@@ -1,4 +0,0 @@
-name: post
-safemethods: []
-supportedstandards: []
-events: []

Post/post_contract.go

@@ -66,11 +66,7 @@ func GetPost(postId string) Post {
 	ctx := storage.GetReadOnlyContext()
 	data := storage.Get(ctx, postId)
 	if data == nil {
-<<<<<<< HEAD
-		panic("user not found")
-=======
 		panic("post not found")
->>>>>>> oracle_uuid
 	}
 
 	return std.Deserialize(data.([]byte)).(Post)