commit dd9b763ef18808637680237d78d8698799ccf8fa
author Phil Sturgeon <email@philsturgeon.co.uk> Wed Aug 10 09:00:13 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:28:56 2011 -0600
tree 7642642fb2b19349c9722ddf16a771a04de049f3
parent fe1d45a023b08753f4c5f1d908d54ae842277558

Fixed conflicts.

application/config/mimes.php

diff --git a/application/config/mimes.php b/application/config/mimes.php
index 8065794..82767d7 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -10,7 +10,7 @@
 
 $mimes = array(	'hqx'	=>	'application/mac-binhex40',
 				'cpt'	=>	'application/mac-compactpro',
-				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
+				'csv'	=>	array('text/x-comma-separated-values', 'text/comma-separated-values', 'application/octet-stream', 'application/vnd.ms-excel', 'application/x-csv', 'text/x-csv', 'text/csv', 'application/csv', 'application/excel', 'application/vnd.msexcel'),
 				'bin'	=>	'application/macbinary',
 				'dms'	=>	'application/octet-stream',
 				'lha'	=>	'application/octet-stream',