test

.gitignore

@@ -0,0 +1,6 @@
+venv/
+__pycache__/
+*.pyc
+*.pyo
+*.pyd
+.DS_Store

README.md

@@ -0,0 +1,4 @@
+python -m venv venv
+source venv/bin/activate
+pip install -r requirements.txt
+python script.py

script.py

@@ -1,4 +1,9 @@
 import numpy as np
 
 print(np.eye(3))
-print("Hello world")
+<<<<<<< HEAD
+print("Hello world")
+=======
+print(np.eye(4))
+print(np.eye(5))
+>>>>>>> d4c78e1110aad09c79e474f060e7b9f7cd97470b