broken manifest

Signed-off-by: sneedium <sneed@sneedmc.org>
2022-11-05 22:02:22 -04:00 · 2022-11-05 22:02:22 -04:00 · 8c68223b04
commit 8c68223b04
parent 6abac40184
2 changed files with 0 additions and 1 deletions
--- a/program_info/sneedmc.6.scd
+++ b/program_info/sneedmc.6.scd
--- a/program_info/sneedmc.manifest
+++ b/program_info/sneedmc.manifest
@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
  <assemblyIdentity name="SneedMC.Application.1" type="win32" version="1.0.0.0" />
->>>>>>> upstream/develop:program_info/polymc.manifest.in
  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
    <security>
      <requestedPrivileges>