Skip to content
Snippets Groups Projects
Commit 573f9fc1 authored by Patient NTUMBA's avatar Patient NTUMBA
Browse files

Resolved merge conflict between master and chorevolution branches

parent ceb98efa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
vsb-manager-api/src/main/java/eu/chorevolution/vsb/manager/api/VsbManager.java
+ 2
− 2
View file @ 573f9fc1
...@@ -54,7 +54,7 @@ import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType; ...@@ -54,7 +54,7 @@ import eu.chorevolution.vsb.gmdl.utils.enums.ProtocolType;
import eu.chorevolution.vsb.logger.GLog; import eu.chorevolution.vsb.logger.GLog;
import eu.chorevolution.vsb.logger.Logger; import eu.chorevolution.vsb.logger.Logger;
public class VsbManager { public class VsbManager{
private boolean STARTING_FROM_JAR = false; private boolean STARTING_FROM_JAR = false;
private Logger logger = GLog.initLogger(); private Logger logger = GLog.initLogger();
...@@ -115,7 +115,7 @@ public class VsbManager { ...@@ -115,7 +115,7 @@ public class VsbManager {
VsbOutput vsbOutput = generate(interfaceDescriptionPath, busProtocol); VsbOutput vsbOutput = generate(interfaceDescriptionPath, busProtocol);
File interfaceDescriptionFile = new File("interfaceDescription.gidl"); File interfaceDescriptionFile = new File("interfaceDescription.gidl");
if (interfaceDescriptionFile.exists()) { if (interfaceDescriptionFile.exists()){
interfaceDescriptionFile.delete(); interfaceDescriptionFile.delete();
} }
......
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