From da2cbc8afc110bc34e882b1545ea4502a7554619 Mon Sep 17 00:00:00 2001
From: Paul Renaudat <prenaudat@excilys.com>
Date: Mon, 9 Feb 2015 15:19:17 +0100
Subject: [PATCH] Delete .gitignore.orig

---
 .gitignore.orig | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 .gitignore.orig

diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100644
index 81cba01..0000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,36 +0,0 @@
-*.class
-######################
-# Eclipse
-######################
-*.pydevproject
-.project
-.metadata
-bin/**
-tmp/**
-tmp/**/*
-doc
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-# Directories #
-/build/
-/bin/
-target/
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-# Package Files #
-*.jar
-*.war
-*.ear
-<<<<<<< HEAD
-c:/*
-=======
-*.classpath
-*.project
-*.tern-project
->>>>>>> 81226a458a775d56acc910906a6f9f8aca12c215