pipeline

Coder0yang · Coder0yang · commit eadc5b102b5f · 2016-08-25T23:06:09.000+08:00
diff --git a/redispipeline/pipeline.go b/redispipeline/pipeline.go
@@ -1,12 +1,21 @@
+<<<<<<< HEAD
 package RedisCtrl
+=======
+package main
+>>>>>>> b10514a02d9a0e099da7f19f0668315ba13a44c4
 
 import (
 	"fmt"
 
 	"github.com/garyburd/redigo/redis"
 )
 
+<<<<<<< HEAD
 func DoRedis(c redis.Conn) {
+=======
+func main() {
+	c, _ := redis.Dial("tcp", "localhost:6379")
+>>>>>>> b10514a02d9a0e099da7f19f0668315ba13a44c4
 	c.Send("MULTI")
 	c.Send("INCR", "foo0")
 	c.Send("INCR", "foo1")
