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
commita98ef1231e3a7f9540eac2fd338d775928f20b45 (patch)
tree911aaa863728d5fea6813cbaf8f28e9722d18fe1
parentdbeac89febc7aa5a9d30e67bc41f4d6b730f3fe4 (diff)
fixing rebase errors
l---------.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes \ No newline at end of file