Resolved conflicts manually.
--- a/day1/session2.tex Tue Oct 27 19:36:09 2009 +0530
+++ b/day1/session2.tex Tue Oct 27 23:31:14 2009 +0530
@@ -261,7 +261,7 @@
\end{frame}
\begin{frame}[fragile]
- \frametitle{List operations}
+\frametitle{List operations}
\begin{lstlisting}
In []: anthrlst = [6,7,8,9]
In []: lnglst = lst + anthrlst
@@ -279,12 +279,12 @@
\section{Simple Pendulum}
\begin{frame}[fragile]
\frametitle{Simple Pendulum - L and T}
-Let us look at a more realistic example of the Simple Pendulum experiment.
+Let us look at the example of the Simple Pendulum experiment.
\begin{center}
\begin{small}
\begin{tabular}{| c | c | c |}
\hline
-L & T & $T^2$ \\ \hline
+$L$ & $T$ & $T^2$ \\ \hline
0.1 & 0.6900 & \\ \hline
0.2 & 0.8989 & \\ \hline
0.3 & 1.1867 & \\ \hline
@@ -366,9 +366,6 @@
Lets look at the pendulum.txt file.
\begin{lstlisting}
$cat data/pendulum.txt
-\end{lstlisting}
-%%$
-\begin{lstlisting}
1.0000e-01 6.9004e-01
1.1000e-01 6.9497e-01
1.2000e-01 7.4252e-01
--- a/day1/session4.tex Tue Oct 27 19:36:09 2009 +0530
+++ b/day1/session4.tex Tue Oct 27 23:31:14 2009 +0530
@@ -96,13 +96,13 @@
\end{frame}
}
-%%\AtBeginSection[]
-%%{
- %%\begin{frame}<beamer>
-%% \frametitle{Outline}
- %% \tableofcontents[currentsection,currentsubsection]
- %%\end{frame}
-%%}
+\AtBeginSection[]
+{
+ \begin{frame}<beamer>
+ \frametitle{Outline}
+ \tableofcontents[currentsection,currentsubsection]
+ \end{frame}
+}
% If you wish to uncover everything in a step-wise fashion, uncomment
% the following command:
@@ -245,11 +245,13 @@
\end{lstlisting}
\end{frame}
+\section{Summary}
\begin{frame}
- \frametitle{Things we have learned}
+ \frametitle{Summary}
+So what did we learn??
\begin{itemize}
- \item
- \item
+ \item Matrices
+ \item Solving linear equations
\end{itemize}
\end{frame}