Exploration
Compare changes
Files
16
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -61,8 +61,6 @@ FPGA::FPGA( ID iID,
@@ -530,14 +528,6 @@ void FPGA::buttonPieChart(std::ofstream& myfile) const{
@@ -630,7 +620,6 @@ void FPGA::schedule2HTML(std::ofstream& myfile) {
@@ -649,7 +638,6 @@ void FPGA::schedule2HTML(std::ofstream& myfile) {
@@ -692,10 +680,7 @@ void FPGA::schedule2HTML(std::ofstream& myfile) {