From f22199bf95f38592688201e2cecbe34e89c18905 Mon Sep 17 00:00:00 2001
From: Oskar Weigl <oskar.weigl@gmail.com>
Date: Wed, 24 Oct 2018 19:58:41 -0700
Subject: [PATCH] merge is ugly but is confirmed working

---
 docs/developer-guide.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/developer-guide.md b/docs/developer-guide.md
index d6243b5b..ecf3e1ea 100644
--- a/docs/developer-guide.md
+++ b/docs/developer-guide.md
@@ -183,7 +183,6 @@ How to use these is shown in the following example.
 * Make sure the rebase finishes, fixing any conflicts that may arise
 
 ### 4. Merge new STM32CubeMX code to your feature branch
-**TODO: Nobody has done this yet, these instructions are new. Please verify that this works as intended.**
 Simply merge the new state at `STM32CubeMX-end` into your feature branch.
 * `git checkout your-feature`
 * `git merge STM32CubeMX-end`