Changeset [98447963d67ceca30270f4ba52c7d3e0e3057cc2] by Michael Barton

August 5th, 2008 @ 01:29 PM

Fixed .gitignore conflict

Merge branch 'www_build'

Conflicts:

.gitignore

http://github.com/michaelbarton/...

Committed by Michael Barton

  • M .gitignore
  • M Rakefile
  • M analysis/001_load_sequence_and_alignment_data/analysis.rake
  • M analysis/002_estimate_sitewise_evolutionary_rate/analysis.rake
  • M analysis/002_estimate_sitewise_evolutionary_rate/description.markdown.erb
  • M analysis/project.rake
  • M controller/main.rb
  • M model/migrations/001_create_projects_table.rb
  • M model/project.rb
  • M model/stage.rb
  • M start.rb
  • M view/css/style.sass
  • M view/index.haml
  • M view/page.haml
  • M view/stage.haml
  • M www/site/README
  • M www/views/README
  • M www/views/layout.haml
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป