search

rmottola / Arctic-Fox

Web Browser for Mac OS X 10.6+, Linux (PowerPC, x86, amd64, ARM, MIPS), NetBSD, OpenBSD, and Windows XP.
Other
289 stars 35 forks source link

big pullup #82

Closed rmottola closed 2 years ago

rmottola commented 2 years ago

There are apparently conflicts, I have them when I first try to "get" your old changes. Please let my changes win if possible, except if we really touched the same file. I think instead it is only git getting confused on a single test file.

wicknix commented 2 years ago

Seems it's this file (which i never touched): browser/base/content/test/general/browser_bug553455.js I'll try to resolve it so i can merge this in.