2 Commits

Author SHA1 Message Date
Nyall Dawson
8db94fc084 Also remove astyle*.diff and sha*.diff files 2015-06-21 14:30:11 +10:00
Nyall Dawson
f9387ca3cf Update remove_git_conflict_files script to also remove *.prepare
Also rename script to remove_temporary_files.sh to reflect this
change.
2015-06-21 14:09:44 +10:00