支持git lfs

cmd/modelconverter/main.go

@@ -44,19 +44,6 @@ func main() {
 	defer oFd.Close()
 	gw := gzip.NewWriter(oFd)
 	defer gw.Close()
-	/*
-		zipWriter := zip.NewWriter(oFd)
-		defer zipWriter.Close()
-
-		fInfo, err := fd.Stat()
-		if err != nil {
-			log.Fatalln(err)
-		}
-		zipFile, err := zipWriter.Create(fInfo.Name())
-		if err != nil {
-			log.Fatalln(err)
-		}
-	*/
 	if sentimentModel {
 		var jsonModel bayes.Model
 		err = json.NewDecoder(fd).Decode(&jsonModel)

utils/string.go

@@ -27,15 +27,12 @@ func StringInSlice(arr []string, i int) string {
 // StringSliceInRange 获取[]string中from-to位置字符串
 func StringSliceInRange(arr []string, from int, to int) []string {
 	l := len(arr)
-<<<<<<< HEAD
 	if from <= -1*l && to <= -1*l {
 		return []string{}
 	}
 	if from >= l {
 		return []string{}
 	}
-=======
->>>>>>> f940ad9 (init commit)
 	return arr[idxInSlice(l, from) : idxInSlice(l, to-1)+1]
 }
 
@@ -48,15 +45,12 @@ func RuneFromIndex(w []rune, i int) string {
 // RuneInRange 从from到to截取字符串
 func RuneInRange(w []rune, from int, to int) string {
 	l := len(w)
-<<<<<<< HEAD
 	if from <= -1*l && to <= -1*l {
 		return ""
 	}
 	if from >= l {
 		return ""
 	}
-=======
->>>>>>> f940ad9 (init commit)
 	return string(w[idxInSlice(l, from) : idxInSlice(l, to-1)+1])
 }