Merge branch 'master' into patch-1

2018-03-07 09:07:17 +00:00
parent 1b1675c967 9e83319287
commit ee06b7e813
3 changed files with 96 additions and 223 deletions
--- a/main.go
+++ b/main.go
@@ -2,12 +2,12 @@ package main

 import (
 	"bytes"
-	"errors"
 	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"errors"

 	"github.com/matryer/moq/pkg/moq"
 )