diff --git a/script.py b/script.py index deb7111..2eed101 100644 --- a/script.py +++ b/script.py @@ -1,9 +1,5 @@ import numpy as np print(np.eye(3)) -<<<<<<< HEAD -print("Hello world") -======= print(np.eye(4)) -print(np.eye(5)) ->>>>>>> d4c78e1110aad09c79e474f060e7b9f7cd97470b +print(np.eye(5)) \ No newline at end of file