From dda6516c5406e08f9e2dec391e075d5f2e075e6d Mon Sep 17 00:00:00 2001
From: christian mueller <christian.ei.mueller@bmw.de>
Date: Thu, 1 Mar 2012 19:20:57 +0100
Subject: * solved merge conflicts

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index fed9435..aa12f3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build/
 doc/
 packages/
 .*
+/packages
-- 
cgit v1.2.1