Fix Merge Conflicts

egovernments · Aug 4, 2022 · f01dcf9 · f01dcf9
1 parent 0fe291c
commit f01dcf9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/business-services/egov-hrms/README.md b/business-services/egov-hrms/README.md
@@ -14,7 +14,7 @@ The objective of HRMS is to provide a service that manages all the employees enr
 - egov-filestore
 
 ### Swagger API Contract
-- Please refer to the [Swagger API contarct](https://editor.swagger.io/?url=https://raw.githubusercontent.com/egovernments/DIGIT-OSS/master/business-services/Docs/hrms-v1.0.0.yaml#!/) for HRMS service to understand the structure of APIs and to have visualization of all internal APIs.
+- Please refer to the [Swagger API contarct](https://editor.swagger.io/?url=https://raw.githubusercontent.com/egovernments/DIGIT-OSS/doc-patch/business-services/Docs/hrms-v1.0.0.yaml#!/) for HRMS service to understand the structure of APIs and to have visualization of all internal APIs.
 
 
 ## Service Details

diff --git a/municipal-services/egov-user-event/README.md b/municipal-services/egov-user-event/README.md
@@ -17,12 +17,9 @@ This service provides APIs to create , update and search such events for the use
 
 Link to the swagger API contract yaml and editor link like below
 
-<<<<<<< HEAD
 https://editor.swagger.io/?url=https://raw.githubusercontent.com/egovernments/DIGIT-OSS/master/municipal-services/docs/user-events.yml#!/
-=======
 https://github.com/egovernments/DIGIT-Dev/blob/master/municipal-services/docs/user-events.yml
 
->>>>>>> c1e1e8ce24 (CORE-139 Merging user events enhancements in master (#2781))
 
 ## Service Details