You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@htrace.apache.org by st...@apache.org on 2015/01/13 20:20:44 UTC
incubator-htrace git commit: HTRACE-70 Fix merge conflict in
.gitignore on 3.1 branch
Repository: incubator-htrace
Updated Branches:
refs/heads/3.1 40cb0fdea -> 41eae2921
HTRACE-70 Fix merge conflict in .gitignore on 3.1 branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/41eae292
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/41eae292
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/41eae292
Branch: refs/heads/3.1
Commit: 41eae2921a02fc4368113b20f0994fadd670a506
Parents: 40cb0fd
Author: stack <st...@duboce.net>
Authored: Tue Jan 13 11:20:28 2015 -0800
Committer: stack <st...@duboce.net>
Committed: Tue Jan 13 11:20:28 2015 -0800
----------------------------------------------------------------------
.gitignore | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/41eae292/.gitignore
----------------------------------------------------------------------
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)