summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:17 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:17 +0200
commit7498d9b2ae3047b6faab10019f44ce98acbf7a52 (patch)
treed41295ce2be6fb8d27f09c302d6644e56c82a604
parente4d3fd6faea32f954923690a111c2466bea1d0c9 (diff)
fixing rebase errors
l---------.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 00000000..f18402b7
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes \ No newline at end of file