Resolved merge conflict in campaign.inc
Fixed merge conflict in main module
Resolved merge conflict in feature fields
Resolved merge conflict in edit access callback
Resolved merge conflict in sub-module info file
case 2416 - Fixed campaign rule settings.
Resolved merge conflict in fields
case 2416 - Added new rule types.
case 2416 - Fixed coding style.
case 2416 - Fixed library rule.
Resolved merge conflict in info file
Resolved merge conflict
Resovled merge conflict in main module
Resovled merge conflict in info file
Case 2600 - Fixed default value for image style.
Case 2490 - Fixed alt attribute for image.
Don't export active_tab, this is the tab that was active the last time the content type was saved.
It isn't used for anything, and will cause overridden status too easily for no reason.
Don't export pathauto, ding_campaigns are shown as blocks/panes they don't have a path.
Furthermore, the pathauto was configured to use a field that ding_campaign doesn't have (slug).
Case 2672 - Removed DAMS alt/title.
Resolved merge conflict in node access