fix: conflicts

Author: vanitha1822

src/main/java/com/iemr/common/utils/IEMRApplBeans.java

@@ -40,12 +40,12 @@
 @Configuration
 public class IEMRApplBeans
 {
-	@Bean
-	public KMService getOpenKMService()
-	{
-		KMService kmService = new OpenKMServiceImpl();
-		return kmService;
-	}
+	// @Bean
+	// public KMService getOpenKMService()
+	// {
+	// 	KMService kmService = new OpenKMServiceImpl();
+	// 	return kmService;
+	// }
 
 	@Bean
 	public Validator getVaidator()

src/main/java/com/iemr/common/utils/km/openkm/OpenKMServiceImpl.java

@@ -51,9 +51,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
-// import org.springframework.context.annotation.Primary;
-// import org.springframework.stereotype.Service;
-// @Service
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+@Service
 // @Primary
 public class OpenKMServiceImpl implements KMService {