Skip to content
Commit a9133823 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

Merge branch 'carlos' into develop 

# Conflicts:
#	sdg-core/src/main/java/es/upv/mist/slicing/nodes/VariableAction.java
parents b2b2401a 0a230da4
Pipeline #112 passed with stage
in 59 seconds
Hide whitespace changes
Inline Side-by-side
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