Fixed git's automerging code corruption.

Markus Humm · Markus Humm · commit b5ad1b4b9fb7 · 2022-07-17T14:53:28.000+02:00
diff --git a/Demos/Cipher_FMX/Cipher_FMX.dpr b/Demos/Cipher_FMX/Cipher_FMX.dpr
@@ -3,11 +3,7 @@ program Cipher_FMX;
 uses
   System.StartUpCopy,
   FMX.Forms,
-<<<<<<< HEAD
   MainFormCipherFMX in 'MainFormCipherFMX.pas' {FormMain};
-=======
-  MainForm in 'MainFormCipherFMX.pas' {FormMain};
->>>>>>> development
 
 {$R *.res}
 
diff --git a/Demos/Hash_FMX/Hash_FMX.dpr b/Demos/Hash_FMX/Hash_FMX.dpr
@@ -3,11 +3,7 @@ program Hash_FMX;
 uses
   System.StartUpCopy,
   FMX.Forms,
-<<<<<<< HEAD
   MainFormHashFMX in 'MainFormHashFMX.pas' {FormMain};
-=======
-  MainForm in 'MainFormHashFMX.pas' {FormMain};
->>>>>>> development
 
 {$R *.res}
 
