Difference between these two pages-- winmerge question

11 Oct 2011, 10:15 PM

#1

Zen Follower

Join Date:: Sep 2006
Posts:: 154
Plugin Contributions:: 0

Difference between these two pages-- winmerge question

Can anyone tell me if this is an actual change that is needed? It looks to me like a paragraph difference...

http://black.countingsheepwebdesigns.com/~muddkids/screenshot-winmerge.JPG

11 Oct 2011, 10:50 PM

#2

drbyte

Sensei

Join Date:: Jan 2004
Posts:: 63,513
Plugin Contributions:: 176

Re: Difference between these two pages-- winmerge question

They appear to be line-ending differences, perhaps added by your FTP program, not by Zen Cart

.
Zen Cart - putting the dream of business ownership within reach of anyone!
Donate to: DrByte directly or to the Zen Cart team as a whole

Remember: Any code suggestions you see here are merely suggestions. You assume full responsibility for your use of any such suggestions, including any impact ANY alterations you make to your site may have on your PCI compliance.
Furthermore, any advice you see here about PCI matters is merely an opinion, and should not be relied upon as "official". Official PCI information should be obtained from the PCI Security Council directly or from one of their authorized Assessors.

11 Oct 2011, 11:16 PM

#3

countingsheep

Zen Follower

Join Date:: Sep 2006
Posts:: 154
Plugin Contributions:: 0

Re: Difference between these two pages-- winmerge question

Does it make a difference that I need to change the files?

11 Oct 2011, 11:20 PM

#4

drbyte

Sensei

Join Date:: Jan 2004
Posts:: 63,513
Plugin Contributions:: 176

Re: Difference between these two pages-- winmerge question

Anytime I find those differences I usually fix them back to the original Zen Cart version, just for consistency.
Fixing them also helps for the next time I do a compare if they've been fixed then I they shouldn't show up next time and leaves me with fewer questions or things to double-check, etc.

.
Zen Cart - putting the dream of business ownership within reach of anyone!
Donate to: DrByte directly or to the Zen Cart team as a whole

Remember: Any code suggestions you see here are merely suggestions. You assume full responsibility for your use of any such suggestions, including any impact ANY alterations you make to your site may have on your PCI compliance.
Furthermore, any advice you see here about PCI matters is merely an opinion, and should not be relied upon as "official". Official PCI information should be obtained from the PCI Security Council directly or from one of their authorized Assessors.