From 7a9e3b08c164d272c2f646039c076e27756eb65d Mon Sep 17 00:00:00 2001 From: rigreco Date: Sun, 1 Mar 2015 11:44:02 +0100 Subject: [PATCH] Solve conflict --- AppleII/FP operations/{UniFP.asm => UniFP2.asm} | 0 AppleII/FP operations/{UniFP_Output.txt => UniFP2_Output.txt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename AppleII/FP operations/{UniFP.asm => UniFP2.asm} (100%) rename AppleII/FP operations/{UniFP_Output.txt => UniFP2_Output.txt} (100%) diff --git a/AppleII/FP operations/UniFP.asm b/AppleII/FP operations/UniFP2.asm similarity index 100% rename from AppleII/FP operations/UniFP.asm rename to AppleII/FP operations/UniFP2.asm diff --git a/AppleII/FP operations/UniFP_Output.txt b/AppleII/FP operations/UniFP2_Output.txt similarity index 100% rename from AppleII/FP operations/UniFP_Output.txt rename to AppleII/FP operations/UniFP2_Output.txt