fix after rebase

mariajgrimaldi · mariajgrimaldi · commit b10a93f5aebb · 2021-06-08T10:26:56.000-04:00
diff --git a/openedx_events/__init__.py b/openedx_events/__init__.py
@@ -1,10 +1,5 @@
 """
-<<<<<<< HEAD
 Package where Open edX Events and the necessary tooling are implemented.
-=======
-Package where Open edX Events and the necessary tooling for their usage are
-implemented.
->>>>>>> refactor: change folder structure following community feedback
 
 These definitions are part of the Hooks Extension Framework, see OEP-50 for
 more information about the project.
