Commit db5f9181 authored by Sven Grabs's avatar Sven Grabs

Merge branch 'master' into 'testMerge'

# Conflicts:
#   Praktikum_1/src/Shape.h
parents 4de4bf61 7ac98093
......@@ -2,7 +2,7 @@
* Shape.h
*
* Created on: 19.10.2020
* Author: Sven Grabs Neuer Branch
* Author: Sven Grabs Master
*/
#include "Makro.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment