Merge conflicts resolved

.pre-commit-config.yaml

@@ -13,6 +13,6 @@ repos:
       - id: ruff  # Linting
 
   - repo: https://github.com/psf/black
-    rev: stable
+    rev: 24.4.2
     hooks:
       - id: black  # formatting

README.md

@@ -0,0 +1,3 @@
+# README
+
+neuer Branch -> Übung1 (mit Tag) und PR

moduleA.py

@@ -0,0 +1,10 @@
+def addition(a=1, b=2):
+    return a + b
+
+
+def f(x: int, y: int) -> int:
+    return x + y
+
+
+if __name__ == "__main__":
+    print(addition(5, 5))

pyproject.toml

@@ -1,3 +1,2 @@
 [tool.pytest.ini_options]
 pythonpath = ["."]
-

test_moduleA.py

@@ -0,0 +1,6 @@
+from src.moduleA import addition
+
+
+def test_a():
+    assert addition() == 3
+    assert addition(5, 5) == 10