1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
Subject: Update .gitignore from Debian packaging branch
The Debian packaging git branch contains these updates to the upstream
.gitignore file(s). This patch is autogenerated, to provide these
updates to users of the official Debian archive view of the package.
[dgit (13.13) update-gitignore]
---
diff --git a/.gitignore b/.gitignore
index a544c47..1db3cc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+.pc
+=======
# Eclipse files
.project
@@ -23,3 +26,4 @@ _cgo_export.*
_testmain.go
*.exe
+>>>>>>> upstream/0.0_git20160302.0.75fb7ed
|
