search

mapaction / mapaction-toolbox

A collection of tools to help streamline the process of producing maps including data renaming and map exports.
GNU General Public License v3.0
3 stars 1 forks source link

Merge single project branch into testing #103

Closed stringfellow closed 9 years ago

stringfellow commented 9 years ago

This contains all the commits @andrewphilipsmith said need to be present. Looks like a conflict exists so that will need resolving first:

deleted by them: arcgis10_mapping_tools/Alpha_ExportTool/Alpha_ExportTool.suo
deleted by them: arcgis10_mapping_tools/Alpha_ExportTool/Alpha_ExportTool/Alpha_ExportTool.csproj.user
deleted by them: arcgis10_mapping_tools/Alpha_ExportTool/Alpha_ExportTool/Config.Designer.cs
deleted by them: arcgis10_mapping_tools/Alpha_ExportTool/Alpha_ExportTool/Config.esriaddinx
andrewphilipsmith commented 9 years ago

Conflict resolved now.