github/elm-mdl
1
0
Fork 0
mirror of https://github.com/correl/elm-mdl.git synced 2024-12-26 03:00:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge (waterfall)

Browse source
This commit is contained in:
Søren Debois 2016-03-29 17:26:30 +02:00
parent 16a5e62784
commit 6f5cf34c67
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/Demo.elm
View file

@ -178,17 +178,10 @@ view addr model =
in
Layout.view (Signal.forwardTo addr LayoutAction) model.layout
<<<<<<< HEAD
{ header = Just header
, drawer = Just drawer
, tabs = Just tabTitles
, main = [ stylesheet, top ]
=======
{ header = header
, drawer = drawer
, tabs = tabTitles
, main = [ top ]
>>>>>>> waterfall
}
{- The following line is not needed when you manually set up
your html, as done with page.html. Removing it will then