Commit f8beae87 authored by Eyal Dechter's avatar Eyal Dechter

Merge branch 'directives' of github.com:edechter/IHaskell into directives

Conflicts:
	deps/tooltip.js
parents 0e96a451 aa7c0a91
......@@ -3,7 +3,6 @@
// commit: #4195
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// Copyright (C) 2008-2011 The IPython Development Team
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment