summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:16 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-18 14:12:16 +0200
commitf54a3d9ceb6bcdead419ec0abfcea6540567473b (patch)
treee0f855a197586a181ee519549d53cd33acfa6e35
parent1f75381e17b6a74e5f2340357e36b76205971375 (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