Projects >> nodebox >>94fb89fb22cf88f8f5b39a95730a58c6664fbe38

Chunk
Conflicting content
            if (argumentMap.containsKey(port)) {
                argument = argumentMap.get(port);
            } else if (port.hasValueRange()) {
<<<<<<< HEAD
                arguments.add(getPortValue(node, port));
=======
                argument = getPortValue(port);
>>>>>>> beb80fe54061a2939231a7473523e17d76be3029
            } else {
                // The port expects a list but nothing is connected. Evaluate with an empty list.
                argument = ImmutableList.of();
Solution content
            if (argumentMap.containsKey(port)) {
                argument = argumentMap.get(port);
            } else if (port.hasValueRange()) {
                argument = getPortValue(node, port);
            } else {
                // The port expects a list but nothing is connected. Evaluate with an empty list.
                argument = ImmutableList.of();
File
NodeContext.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable