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
commitb3c10ed45fabb5236dc59b6a84ac8d9e5267afd6 (patch)
tree7db7f0dbd818fdd0b14ec9782b7d56a086107f88
parent3f2d52647980fd05b5f23b1221430ad7cc9dde7d (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