gitquery: implement session

erizocosmico · erizocosmico · commit 2b536397df00 · 2018-03-14T10:55:06.000+01:00
Signed-off-by: Miguel Molina &lt;miguel@erizocosmi.co&gt;
diff --git a/session.go b/session.go
@@ -29,7 +29,10 @@ func NewSessionBuilder(pool *RepositoryPool) server.SessionBuilder {
 		return NewSession(ctx, pool)
 	}
 }
+<<<<<<< HEAD
 
 // ErrInvalidGitQuerySession is returned when some node expected a GitQuery
 // session but received something else.
 var ErrInvalidGitQuerySession = errors.NewKind("expecting gitquery session, but received: %T")
+=======
+>>>>>>> gitquery: implement session

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ func NewSessionBuilder(pool *RepositoryPool) server.SessionBuilder {`
`29`	`29`	`return NewSession(ctx, pool)`
`30`	`30`	`}`
`31`	`31`	`}`
	`32`	`+<<<<<<< HEAD`
`32`	`33`
`33`	`34`	`// ErrInvalidGitQuerySession is returned when some node expected a GitQuery`
`34`	`35`	`// session but received something else.`
`35`	`36`	`var ErrInvalidGitQuerySession = errors.NewKind("expecting gitquery session, but received: %T")`
	`37`	`+=======`
	`38`	`+>>>>>>> gitquery: implement session`