Projects >> overthere >>109bb9a626ef56d901cfc1446069aaeef7ca0d03

Chunk
Conflicting content 
package com.xebialabs.overthere.ssh;

<<<<<<< HEAD
import static com.xebialabs.overthere.ssh.SshConnectionBuilder.SUDO_PASSWORD_PROMPT_REGEX_DEFAULT;
=======
>>>>>>> 6cf62419649040e856dd00faaf3b36cea7b4f88b
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
Solution content 
package com.xebialabs.overthere.ssh;

import static com.xebialabs.overthere.ssh.SshConnectionBuilder.SUDO_PASSWORD_PROMPT_REGEX_DEFAULT;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
File
SshInteractiveSudoPasswordHandlingStreamTest.java
Developer's decision
Version 1
Kind of conflict
Import