Homec4science

merge conflict solving.

Authored by nobar on Oct 20 2019, 09:37.

Description

merge conflict solving.

Details

Committed
nobarOct 20 2019, 09:37
Pushed
nobarOct 20 2019, 11:05
Parents
R9442:c9de5107b88a: circuit charge and discharge added.
R9442:ae39722535d2: Polarizations and Snell interactive plots added
Branches
Unknown
Tags
Unknown

Event Timeline

mahdinobar <mahdinobar1993@gmail.com> committed R9442:9f3b4d09b765: merge conflict solving. (authored by mahdinobar <mahdinobar1993@gmail.com>).Oct 20 2019, 09:37

Merged Changes

CommitAuthorDetailsCommitted
ae39722535d2Daniel Felipe Forero Sanchez
Polarizations and Snell interactive plots added 
Oct 16 2019
bd46a993d636Fatine
Merge branch 'staging' of https://c4science. 
Oct 16 2019
2cb4fb2fd584Fatine
Some illustrations 
Oct 16 2019
241dfaf24719Arnaud Gaudard
2 cells done - needs more interactivity 
Oct 16 2019
f1cf69cd4590Arnaud Gaudard
Added functional 3d plot template 
Oct 16 2019
52e61b4be30bverlekar
Adding text for Wave equation nb 
Oct 15 2019