Merge conflict

alfa-addon · Jan 17, 2025 · 1aa3477 · 1aa3477
1 parent 3be5baf
commit 1aa3477
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/plugin.video.alfa/lib/alfaresolver.py b/plugin.video.alfa/lib/alfaresolver.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3.py b/plugin.video.alfa/lib/alfaresolver_py3.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_06.py b/plugin.video.alfa/lib/alfaresolver_py3_3_06.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_07.py b/plugin.video.alfa/lib/alfaresolver_py3_3_07.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_08.py b/plugin.video.alfa/lib/alfaresolver_py3_3_08.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_09.py b/plugin.video.alfa/lib/alfaresolver_py3_3_09.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_10.py b/plugin.video.alfa/lib/alfaresolver_py3_3_10.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_11.py b/plugin.video.alfa/lib/alfaresolver_py3_3_11.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_12.py b/plugin.video.alfa/lib/alfaresolver_py3_3_12.py
diff --git a/plugin.video.alfa/lib/alfaresolver_py3_3_13.py b/plugin.video.alfa/lib/alfaresolver_py3_3_13.py