aboutsummaryrefslogtreecommitdiff
path: root/chapter/6/consistency-crdts.md
diff options
context:
space:
mode:
authorHeather Miller <heather.miller@epfl.ch>2016-12-18 15:59:07 -0500
committerGitHub <noreply@github.com>2016-12-18 15:59:07 -0500
commitb8ea0136877b83801707f85ca902ce033fffe360 (patch)
tree0405d53412ce19830d1550f08d4879148d79201f /chapter/6/consistency-crdts.md
parent313f5c7bdd02346683b376f54301792e9f2e48f5 (diff)
parent5b299d189255e04ca3481a15e15b2a2e10b29b42 (diff)
Merge branch 'master' into Jingjing-Abhilash-bigdata-v2Jingjing-Abhilash-bigdata-v2
Diffstat (limited to 'chapter/6/consistency-crdts.md')
-rw-r--r--chapter/6/consistency-crdts.md11
1 files changed, 0 insertions, 11 deletions
diff --git a/chapter/6/consistency-crdts.md b/chapter/6/consistency-crdts.md
deleted file mode 100644
index fcb49e7..0000000
--- a/chapter/6/consistency-crdts.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: page
-title: "Consistency & CRDTs"
-by: "Joe Schmoe and Mary Jane"
----
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. {% cite Uniqueness --file consistency-crdts %}
-
-## References
-
-{% bibliography --file consistency-crdts %} \ No newline at end of file