Skip to content

Commit

Permalink
Merge branch 'master' into seismiclectures
Browse files Browse the repository at this point in the history
  • Loading branch information
lheagy committed Oct 7, 2016
2 parents 4f8d618 + 2d15dc7 commit a6c29e6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions content/schedule.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ This page will be updated regularly throughout the year, check it often.
+ +---+--+------------------+-----------------------------+------------------------+------------------------------+------------+
| | 10| 6| Thanksgiving | | No Class | No Lab || `Thibaut`_|
+ +---+ +------------------+-----------------------------+------------------------+------------------------------+ +
| | 12| || Seismic | | |- `Lab 5 Seismic Reflection`_ | |
| | 12| || Seismic |- `GPG Seismic`_ | |- `Lab 5 Seismic Reflection`_ | |
| | | || Reflection | | |- `Seismic Reflection App`_ | |
| | | || & MASW | | | | |
| | | || & MASW | | | | |
+ +---+ +------------------+-----------------------------+------------------------+------------------------------+ +
| | 14| || Seismic TBL |- `Seismic Case History`_ |- `TBL 3 Individual`_ | | |
| | | | | |- `TBL 3 Team`_ | | |
Expand All @@ -64,10 +64,10 @@ This page will be updated regularly throughout the year, check it often.
| | | | | | |- `Seismic Reflection App`_ | |
+ +---+ + + + +------------------------------+ +
| | 19| | | | | No Lab | |
+ +---+ + + +------------------------+ + +
| | 21| | | |- Seismic Quiz | | |
+ +---+--+ + +------------------------+------------------------------+------------+
| | 24| 8| | |- `Lecture 5 GPR`_ |- `Lab 6 GPR`_ || `Devin`_ |
+ +---+ +------------------+-----------------------------+------------------------+ + +
| | 21| || Seismic Quiz |- `GPG Seismic`_ |- Seismic Quiz | | |
+ +---+--+------------------+-----------------------------+------------------------+------------------------------+------------+
| | 24| 8| |- `GPG GPR`_ |- `Lecture 5 GPR`_ |- `Lab 6 GPR`_ || `Devin`_ |
| | | | | | |- `GPR App`_ | |
+ +---+ + +-----------------------------+------------------------+ + +
| | 26| | |- `GPR Case History`_ |- `TBL 4 Individual`_ | | |
Expand Down

0 comments on commit a6c29e6

Please sign in to comment.