repo: gemini-site
action: commit
revision: 
path_from: 
revision_from: 4d6cbe8b27b190a9b26e4b5825258b8c5e31226a:
path_to: 
revision_to: 

commit 4d6cbe8b27b190a9b26e4b5825258b8c5e31226a
Merge: 5b31408 f3dbe0b
Author: Solderpunk 
Date:   Sat Nov 23 19:54:06 2019 +0000

    Merge branch 'master' of /var/gemini

diff --cc docs/faq.txt
index d8276d784186e6c710fcf128d041002f686d2881,4159a1132a3992015734dc9662e547b69fa87cb1..19fe31950b71a03a4ecad41743e7255e3f337bbc
--- a/docs/faq.txt
+++ b/docs/faq.txt
@@@ -90,6 -90,10 +90,13 @@@ actual project, it seemed wise to send 

  ## 2.1 What are the design criteria for Gemini?

++<<<<<<< HEAD
++=======
+ The following criteria were informally put in place at the beginning
+ of the project.  It's debatable how closely some of these goals have
+ been met, but in general Gemini is still quite close to this target.
+ 
++>>>>>>> f3dbe0b113d59bc508fe589478809769783f1650
  The following are the core design criteria of the Gemini protocol:

  ### 2.1.1 Simplicity

-----END OF PAGE-----