without Ming's latest
Merge branch 'master' of https://github.com/yaodaniel/CS143-lab2
flushPage(TransactionId) working
Merge branch 'master' of https://github.com/yaodaniel/CS143-lab2
Not working (after Ming's)
found error, and fixed
found error and fixed
fixed merge conflict?
Merge branch 'master' of https://github.com/yaodaniel/CS143-lab2
trying to fix merge conflict
Will pull from Ming
trying to fix merge conflict
Complete lab