Browse Source

Forgot newline

Joeri Exelmans 3 years ago
parent
commit
1285343c1c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      README.md

+ 2 - 1
README.md

@@ -1,6 +1,7 @@
 
 # Dependency-aware Operation History
 ... or **Doh** for short (pronounced "dough" or "D'OH!" - see illustration below) is a **distributed, operation-based, dependency-aware version control system (VCS)**.
+
 ![D'oh!](homer.jpg)
 
 ## Goals
@@ -39,4 +40,4 @@ The easiest way (for me) to explain Doh, is to compare it with Git. Back when I
 |HEAD points to a|Single version|Set of independent, non-conflicting operations (= set of versions)|
 |What's the result of a merge?|A new version, with as parents the merged versions|An update to HEAD, being the union of the merged HEADs
 |Conflict resolution|Manually specify what the merged version must look like|Destructive: manually or randomly pick an operation to be excluded from HEAD. (The excluded operation becomes an abandoned branch.)|
-|Version IDs|Content-addressed (SHA-1)|GUIDs (I want to change this to content-addressed at some point)
+|Version IDs|Content-addressed (SHA-1)|GUIDs (I want to change this to content-addressed at some point)