From 3db33d420266c30a058d2a22b2a4d7d74cfe5c98 Mon Sep 17 00:00:00 2001
From: Niry Rakotosalama <nirilanto.rakotosalama@thalesgroup.com>
Date: Fri, 4 Jul 2014 12:38:19 +0200
Subject: [PATCH] DCR860 : corrects interface hrgonio evolution impacts new
 release 0.10.0          updates .deb dependances

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5b16382..87a360b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os
-- 
2.30.2