Merge branch 'dev' into safety-controller

2020-07-30 22:51:08 +02:00 · 2020-07-30 22:51:08 +02:00 · fdf3f2c7d6
commit fdf3f2c7d6
parent 464c247e32 21ad2ace4a
2 changed files with 1 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -5,7 +5,4 @@
 	path = c-style-checker
 	url = https://git.shimatta.de/mhu/c-style-checker.git
 	branch = master
-[submodule "reflow-controller-temp-profile-lang"]
-	path = reflow-controller-temp-profile-lang
-	url = https://git.shimatta.de/mhu/reflow-controller-temp-profile-lang.git
-	branch = master
+
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit c369231e42ecd67bf4d1a72a54b165dcee3b6bdb
				`@ -1 +0,0 @@`
				`Subproject commit c369231e42ecd67bf4d1a72a54b165dcee3b6bdb`