From 1378d88f6c536d018cee9cbc33a772e0dc6a39e8 Mon Sep 17 00:00:00 2001
From: seba-1511 <seba-1511@hotmail.com>
Date: Sat, 5 Dec 2020 09:59:00 -0800
Subject: [PATCH] Fix merge conflict in _version.py

---
 learn2learn/_version.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/learn2learn/_version.py b/learn2learn/_version.py
index a1330acb..66a87bb6 100644
--- a/learn2learn/_version.py
+++ b/learn2learn/_version.py
@@ -1,5 +1 @@
-<<<<<<< HEAD
-__version__ = '0.1.4'
-=======
 __version__ = '0.1.5'
->>>>>>> fcc7e47f366d7396158335123c173bf3a151f8bd