It is not showing the changes I made in the individual.tpl.js when I looked at what was to merge, but I just assume its because it doesn't conflict with anything? Let me know if that is not the case because there are definitely changes between the two that are important.
It is not showing the changes I made in the individual.tpl.js when I looked at what was to merge, but I just assume its because it doesn't conflict with anything? Let me know if that is not the case because there are definitely changes between the two that are important.