commit after resolving conflicts
authorHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
committerHamed <hamed.gorjiara@gmail.com>
Thu, 15 Jun 2017 19:56:05 +0000 (12:56 -0700)
.gitignore

index 5085742..39d4e58 100644 (file)
@@ -4,3 +4,4 @@ nbproject/
 #Ignoring binary files
 src/bin/
 src/lib_cons_comp.so
+/src/mymemory.cc