Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into int_tr65_nra_2.3.1

[debian6500.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a63dd0d7ca74fcf95ce29ed3460796515fbaf330..524514587707eef83a80e27387d26ce47af90dda 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ prod_rhp*
 *~
 *.contrib*
 *.keep
+*.orig
+*.merge
 *.pyc
 *.o
 *.os