From: jkratoch <>
Date: Tue, 2 Mar 2010 22:11:26 +0000 (+0000)
Subject: init
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=9d552e73abda2b6efa47e9311e5b421a71eb241c;hp=bbb1e712dd2f1393dec4e3c8f01cb020702e330c

init
---

diff --git a/.gitconfig b/.gitconfig
new file mode 100644
index 0000000..0b649b0
--- /dev/null
+++ b/.gitconfig
@@ -0,0 +1,4 @@
+[user]
+	email = jan.kratochvil@redhat.com
+[merge]
+	conflictstyle = diff3