Yes you would need to merge the "customers.php" files as both "Admin New Order" and "Admin New Customer" modify the same core file. With WinMerge, you just compare the two files and tell it to "merge" the code. Sent you a PM ;)
Merge #1: Right to Left (click to enlarge)
Attachment 12011
Merge #2: Left to Right (click to enlarge)
Attachment 12012


Reply With Quote
