Skip to content

Commit c72f16c

Browse files
committed
fix: resolve merge conflict in Program.cs
1 parent 2f368db commit c72f16c

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

backend/src/CCE.Api.Internal/Program.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,9 @@
8585
app.MapHomepageSettingsEndpoints();
8686
app.MapAboutSettingsEndpoints();
8787
app.MapPoliciesSettingsEndpoints();
88-
<<<<<<< feat/services-evaluation
89-
app.MapMediaEndpoints();
90-
app.MapEvaluationEndpoints();
91-
=======
9288
app.MapMediaEndpoints();
9389
app.MapCountryCodeEndpoints();
94-
>>>>>>> develop
90+
app.MapEvaluationEndpoints();
9591

9692
// Sub-11d follow-up — dev sign-in shim. Mounts /dev/sign-in,
9793
// /dev/sign-out, /dev/whoami when Auth:DevMode=true. Production

0 commit comments

Comments
 (0)