From eccf6a5160c42d4c2583cb7866b9fc5d4c2f2c2f Mon Sep 17 00:00:00 2001
From: Primal Pappachan
Date: Thu, 7 Jun 2012 12:36:23 +0800
Subject: removed unwanted text

---
 fossee.tex | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/fossee.tex b/fossee.tex
index 3d7a1b1..5a262cc 100644
--- a/fossee.tex
+++ b/fossee.tex
@@ -61,13 +61,15 @@
 \tableofcontents
 \end{frame}
 
-<<<<<<< HEAD
 \section{FOSSEE}
 \begin{frame}
 \frametitle{FOSS for EE}
+\centering{
 \includegraphics[scale=0.30]{foss_ee.png}
+}
 \end{frame}
 
+\subsection{How}
 \begin{frame}
 \frametitle{How?}
 \begin{itemize}
@@ -84,8 +86,9 @@
 \includegraphics[scale=.30]{tree.png}
 \end{frame}
 
+\subsection{What}
 \begin{frame}
-\frametitle{WTF: What the FOSSEE}
+\frametitle{WtF: What the FOSSEE}
 \begin{block}{FOSSEE}
 is  part of the National Mission on Education through ICT with the thrust area being \alert{Adaptation and deployment of open source simulation packages equivalent to proprietary software}, funded by MHRD.
 \end{block}
@@ -97,6 +100,7 @@ is  part of the National Mission on Education through ICT with the thrust area b
 \end{block}
 \end{frame}
 
+\subsection{Why}
 \begin{frame}
 \frametitle{Why}
 \begin{columns}
@@ -149,6 +153,15 @@ In Python terms
 \end{itemize}
 \end{exampleblock}
 \end{columns}
+\begin{block}<3->{Focus}
+\begin{itemize}
+\item Python
+\item NumPy
+\item SciPy
+\item Sage
+\end{itemize}
+\end{exampleblock}
+
 \end{frame}
 
 
-- 
cgit