for merge resolution

2019-06-30 15:33:15 -03:00
parent 79af252d8a
commit 96bce5d3f6
1 changed files with 0 additions and 16 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,16 +0,0 @@
 cmake_minimum_required(VERSION 3.14)
 project(park)
 set(CMAKE_CXX_STANDARD 11)
 add_executable(park
    main.cpp
    Customer.cpp
    headers/Customer.h
    Park_spot.cpp
    headers/Park_spot.h
    Park_time.cpp
    headers/Park_time.h
 	)