Resolve conflict - two patch_45_46e.sql had been independently added.
Resolve conflict - two patch_45_46e.sql had been independently added.

mjg17/ensembl,james-monkeyshines/ensembl,mjg17/ensembl,willmclaren/ensembl,danstaines/ensembl,muffato/ensembl,at7/ensembl,danstaines/ensembl,mjg17/ensembl,Ensembl/ensembl,muffato/ensembl,at7/ensembl,danstaines/ensembl,at7/ensembl,Ensembl/ensembl,james-monkeyshines/ensembl,mjg17/ensembl,at7/ensembl,Ensembl/ensembl,muffato/ensembl,Ensembl/ensembl,willmclaren/ensembl,james-monkeyshines/ensembl,james-monkeyshines/ensembl,muffato/ensembl