Update content-service_application.conf

c1d4a047 · Prasath Sivasubramaniyan · GitHub · 1c8a2662 · c1d4a047
Unverified Commit c1d4a047 authored 2 years ago by Prasath Sivasubramaniyan Committed by GitHub 2 years ago
Hide whitespace changes
Inline Side-by-side

Showing

with 0 additions and 4 deletions
+0 -4
--- a/ansible/roles/stack-sunbird/templates/content-service_application.conf
+++ b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -677,8 +677,4 @@ cloudstorage {
  metadata.list={{ cloudstorage_metadata_list }}
  read_base_path="{{ cloudstorage_base_path }}"
  write_base_path={{ valid_cloudstorage_base_urls }}
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> 76e016349195d47d33ca3dbbc612eda722bc1a13