Thanks to visit codestin.com
Credit goes to github.com

Skip to content

AsteriskServer.java: Remove traces of previous merge conflict. #616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2024
Merged

AsteriskServer.java: Remove traces of previous merge conflict. #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/main/java/org/asteriskjava/live/AsteriskServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,10 @@ void originateToApplicationAsync(String channel, String application, String data
String getVersion() throws ManagerCommunicationException;

/**
* <<<<<<< HEAD Returns the CVS revision of a given source file of this
* Returns the CVS revision of a given source file of this
* Asterisk server. <br>
* ======= Returns the CVS revision of a given source file of this Asterisk
* server. <br>
* >>>>>>> refs/heads/release-1.1 For example getVersion("app_meetme.c") may
* return {1, 102} for CVS revision "1.102". <br>
* For example getVersion("app_meetme.c") may return {1, 102} for
* CVS revision "1.102". <br>
* Note that this feature is not available with Asterisk 1.0.x. <br>
* You can use this feature if you need to write applications that behave
* different depending on specific modules being available in a specific
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/org/asteriskjava/util/internal/SocketConnectionFacadeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,8 @@ public class SocketConnectionFacadeImpl implements SocketConnectionFacade {
private Trace trace;

/**
* <<<<<<< HEAD Creates a new instance for use with the Manager API that
* uses UTF-8 as encoding and CRNL ("\r\n") as line delimiter. =======
* Creates a new instance for use with the Manager API that uses CRNL
* ("\r\n") as line delimiter. >>>>>>> refs/heads/release-1.1
* Creates a new instance for use with the Manager API that uses UTF-8
* as the encoding and CRLF ("\r\n") as line delimiter.
*
* @param host the foreign host to connect to.
* @param port the foreign port to connect to.
Expand All @@ -64,7 +62,7 @@ public SocketConnectionFacadeImpl(String host, int port, boolean ssl, int timeou

/**
* Creates a new instance for use with the Manager API that uses the given
* encoding and CRNL ("\r\n") as line delimiter.
* encoding and CRLF ("\r\n") as line delimiter.
*
* @param host the foreign host to connect to.
* @param port the foreign port to connect to.
Expand Down
Loading