dmspine64backup/test.cpp

#include <iostream>
#include "DBEngine.h"

using namespace std;

int main() {
	DBEngine engine;
	Relation r;
	Attribute<int> a;
}
message 2015-09-14 15:04:54 -05:00			`#include <iostream>`
updating structure 2015-09-15 16:30:25 -05:00			`#include "DBEngine.h"`
message 2015-09-14 15:04:54 -05:00
got our stuff together 2015-09-14 18:31:05 -05:00			`using namespace std;`

fixed the merge conflict 2015-09-14 17:03:23 -05:00			`int main() {`
updating structure 2015-09-15 16:30:25 -05:00			`DBEngine engine;`
			`Relation r;`
			`Attribute<int> a;`
updates 2015-09-15 10:21:16 -05:00			`}`