fix: remove conflicts when pushing

spacelab-ufsc · Aug 2, 2024 · e21b822 · e21b822
1 parent 9c265b7
commit e21b822
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 429 deletions.
diff --git a/hardware/.gitignore → .gitignore b/hardware/.gitignore → .gitignore
@@ -36,3 +36,5 @@ cam/
 # Exported Centroid files
 
 centroid/
+
+
diff --git a/README.md b/README.md
@@ -51,6 +51,6 @@ This project is open-source under three different licenses: CERN Open Hardware L
 
 ## Notes
 
-
+t
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,5 @@ cam/
		# Exported Centroid files

		centroid/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -51,6 +51,6 @@ This project is open-source under three different licenses: CERN Open Hardware L

		## Notes


		t