From 4116fbed79dc48c51eb33c13075c399a247e3bb0 Mon Sep 17 00:00:00 2001
From: Neal Davis <davis68@illinois.edu>
Date: Tue, 18 Mar 2014 10:06:45 -0500
Subject: [PATCH] testing conflicts.

---
 project.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.txt b/project.txt
index ac29562..404c2b8 100644
--- a/project.txt
+++ b/project.txt
@@ -1,2 +1,2 @@
-computational chemistry for nuclear engineering
+dft simulations for nuclear engineering
 compiler design