projectmesa / mesa

56%

master: 77%

LAST BUILD ON BRANCH v0.6.5.1

branch: v0.6.5.1

CHANGE BRANCH

x

Reset

• v0.6.5.1
• 0.6.5.1
• 337-let_server_work_in_jupyter
• 410_fix_distance
• 452_reqs
• ExampleUpdates
• FixTornado
• Fixes499
• PR528
• auto-year-update
• bank_reserves_about
• batchrunner.fix
• boltzmann_pep_updates
• ci-integration
• clean_modules.79
• clean_modules.fix
• cm.fix
• concurrency.35
• continuous_space.17
• contributing-update
• contribution-clarification
• coord_standardize.100
• data_collector.101
• datacollector_fix
• dict_params_fix
• dmasad.ticket97
• doc_rst.162
• docs
• docs-fix
• docs_links_fix.331
• docs_update
• documentation_fix.313
• example_test
• f8-cleanup
• ffire
• fix-docs
• fix-readme
• fix-readme-install-command
• fix-schelling-documentation
• fix_flockers
• fix_tutorial
• fixing_wolf_sheep
• flocker-hell
• flocker_readme_476
• flockers-hell
• ghost_flockers
• gitignore
• happy-new-year
• history_clean_up
• import-bug-fix
• jeetu7
• jupyter_fix
• launch_browser_with_server-322
• license-update
• license-year-update
• link-add
• master
• master.temp
• merge-test
• mesa_packages_pages
• minor_cleanup
• model-rename.324
• model-rewrite
• mpp_jk
• networks
• new.seed
• package_setup_updates
• packaging
• pep-examples
• pr/157
• pr/161
• pr/383
• pr/529
• pyconsprints
• readthedocs
• release
• release_fix
• remove-versions
• revert-330-contribution-clarification
• revert-675-markdown
• revert-677-revert-675-markdown
• schedule.agent.dict
• serialization.test
• setup-req-change
• simulsched.139
• staged_activation.166
• svg-update
• tempate-text-update
• test-coverage
• test-coverage.105
• testing
• tests-base
• tutorial.119
• tutorial_update
• update-license
• update_docs_0713
• update_port.320
• update_reqs
• v0.6.0
• v0.6.5
• v0.7.8
• v0.7.8.1
• v0.8.0
• v0.8.1
• v0.8.2
• v0.8.3
• v0.8.4
• v0.8.5
• v0.8.6
• viz-readme-fix
• zero_state

Build # 249

Build Type

push

travis-ci

Committed by jackiekazil

Commit Message

Resolving conflict.

Run Details

354 of 628 relevant lines covered (56.37%)

0.56 hits per line