refactor: Migrate MultipartEncoder to RequestsBackend

Liora Milbaum · Liora Milbaum · commit 8022ec4a994e · 2022-12-19T20:43:52.000+02:00
diff --git a/gitlab/http_backends/requests_backend.py b/gitlab/http_backends/requests_backend.py
@@ -1,5 +1,8 @@
+<<<<<<< HEAD
 from __future__ import annotations
 
+=======
+>>>>>>> 1696ad0 (refactor: Migrate MultipartEncoder to RequestsBackend)
 from typing import Any, Dict, Optional, Tuple, TYPE_CHECKING, Union
 
 import requests
