conflict resolved in .travis.yml

Author: sbinet

gopy.gide

@@ -28,15 +28,16 @@
     "Run Proj"
   ],
   "Find": {
-    "Find": "Chdir",
-    "Replace": "VarFromHandle",
+    "Find": "goki",
+    "Replace": "go-python",
     "IgnoreCase": false,
     "Langs": [
       "Go",
       "Python"
     ],
     "Loc": "FindLocAll",
     "FindHist": [
+      "goki",
       "Chdir",
       "buildTuple",
       "GoSrcDir",
@@ -75,7 +76,6 @@
       "universe",
       "isPyCompatFunc",
       "isPyCompatField",
-      "goki",
       "isStringer",
       "genMap",
       "genMapInit",
@@ -89,6 +89,7 @@
       "with go"
     ],
     "ReplHist": [
+      "go-python",
       "VarFromHandle",
       "modeExe",
       "modeGen",