Continued a bit:

[addressbook-mailer-ejb.git] / src / java / org / mxchange / jphone / phonenumbers / mobileprovider / AddressbookMobileProviderSingletonBean.java

diff --git a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java
index 1875fe4f2d43250e0dbd6c0b7d3941508fd84583..28b118df10caf8b9b2a80e88ed5fc88079b87349 100644 (file)
--- a/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java
+++ b/src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java
@@ -29,13 +29,8 @@ import org.mxchange.jcoreee.database.BaseDatabaseBean;
  * @author Roland Haeder<roland@mxchange.org>
  */
 @Startup
-<<<<<<< HEAD:src/java/org/mxchange/jphone/phonenumbers/mobileprovider/AddressbookMobileProviderSingletonBean.java
 @Singleton (name = "mobileprovider", description = "A singleton session bean for SMS provider informations")
 public class AddressbookMobileProviderSingletonBean extends BaseDatabaseBean implements MobileProviderSingletonBeanRemote {
-=======
-@Singleton (name = "mobileProvider", description = "A singleton session bean for SMS provider informations")
-public class LandingMobileProviderSingletonBean extends BaseLandingDatabaseBean implements MobileProviderSingletonBeanRemote {
->>>>>>> 3b7cccf... Please cherry-pick::src/java/org/mxchange/jphone/phonenumbers/mobileprovider/LandingMobileProviderSingletonBean.java
 
        /**
         * Serial number