webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-09-05 13:40:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix unmerged files

Browse source
This commit is contained in:
technillogue 2021-04-24 22:37:59 -04:00
parent 685fce477c
commit cc5bb13519
5 changed files with 6 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/src/main/java/org/asamk/signal/manager/Manager.java
View file

@ -161,14 +161,11 @@ import java.util.concurrent.TimeoutException;
import java.util.function.Function;
import java.util.stream.Collectors;
<<<<<<< HEAD:src/main/java/org/asamk/signal/manager/Manager.java
import static org.asamk.signal.manager.ServiceConfig.CDS_MRENCLAVE;
import static org.asamk.signal.manager.ServiceConfig.capabilities;
import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
import static org.asamk.signal.manager.ServiceConfig.getIasKeyStore;
=======
import static org.asamk.signal.manager.config.ServiceConfig.capabilities;
>>>>>>> upstream/master:lib/src/main/java/org/asamk/signal/manager/Manager.java
public class Manager implements Closeable {