commit 41eae2921a02fc4368113b20f0994fadd670a506 Author: stack Date: Tue Jan 13 11:20:28 2015 -0800 HTRACE-70 Fix merge conflict in .gitignore on 3.1 branch diff --git a/.gitignore b/.gitignore index db19503..ac643a3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,14 +10,6 @@ *.swp dependency-reduced-pom.xml htrace-core/src/go/src/org/apache/htrace/resource -<<<<<<< HEAD -htrace-core/src/go/src/github.com/ -htrace-core/src/go/src/gopkg.in/ -htrace-core/src/go/src/org/apache/htrace/common/version.go -htrace-core/src/go/src/code.google.com/ -htrace-core/src/go/src/golang.org/ -======= !htrace-core/src/go/src/org/apache/htrace/resource/catalog.go htrace-core/src/go/build htrace-core/src/go/pkg ->>>>>>> 10f2c6a... HTRACE-67 The go build should put downloaded files into a separate directory (Colin Patrick McCabe)