]> wagner.pp.ru Git - fiction/jasmina.git/commit
Fix merge conflict on the notebook
authorVictor Wagner <vitus@wagner.pp.ru>
Sat, 27 Sep 2014 11:03:52 +0000 (15:03 +0400)
committerVictor Wagner <vitus@wagner.pp.ru>
Sat, 27 Sep 2014 11:03:52 +0000 (15:03 +0400)
commit8967b6f48424c8a82ac686666e39583446a248e7
treed2de3d439deac5cabe1b6a95d4e553f02f878389
parent4b8d0ad3d6ae82e051dd8d750d829b2fbec010d4
parentbc7ac65d748c3f1f7cbaf6fd25a3af947f8a864b
Fix merge conflict on the notebook
jenni.txt