From 342f1e725a6f8f59149d99088a267230d8e27b86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=AE=AE=E0=AE=A9=E0=AF=8B=E0=AE=9C=E0=AF=8D=E0=AE=95?=
 =?UTF-8?q?=E0=AF=81=E0=AE=AE=E0=AE=BE=E0=AE=B0=E0=AF=8D=20=E0=AE=AA?=
 =?UTF-8?q?=E0=AE=B4=E0=AE=A9=E0=AE=BF=E0=AE=9A=E0=AF=8D=E0=AE=9A=E0=AE=BE?=
 =?UTF-8?q?=E0=AE=AE=E0=AE=BF?= <smartmanoj42857@gmail.com>
Date: Tue, 3 May 2022 19:18:33 +0530
Subject: [PATCH] revert .gitignore changes

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23f505ea0..ee6906ef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,6 @@ freqtrade/rpc/api_server/ui/*
 # Macos related
 .DS_Store
 
-# git files after merging
-*.orig
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]