3 Commits

Author	SHA1	Message	Date
petropoulos	a0444d469f	What :resolve conflict on the abstract - Why : still testing	2012-06-05 13:00:40 +00:00
foley	514249c9f3	update to the abstract. Creating a contrived abstract to test conflict resolution.	2012-06-05 12:53:27 +00:00
foley	4a9987e161	latex test file	2012-06-05 11:54:24 +00:00