Projects >> eucalyptus >>cc0ed17bb2ee48c66e2b32fa7277d4078e4a148e

Chunk
Conflicting content 
          } catch (IllegalStateException e) {} catch ( Throwable e ) {
            LOG.debug( e, e );
          }
<<<<<<< HEAD
        } catch (IllegalStateException e) {} catch ( Throwable e ) {
          LOG.debug( e, e );
=======
>>>>>>> bd43884baabaeb2dcf5682bc8cbf20d6dcd07869
        }
        vm.setNetworkIndex( -1 );
        try {
Solution content 
          } catch (IllegalStateException e) {} catch ( Throwable e ) {
            LOG.debug( e, e );
          }
        }
        vm.setNetworkIndex( -1 );
        try {
File
SystemState.java
Developer's decision
Version 2
Kind of conflict
Catch clause
Method invocation