diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b6ce61c712326fbed417468d52abd5ae4c318d7b --- /dev/null +++ b/.DS_Store @@ -0,0 +1,2 @@ +ADFOAIBDVOIXBIOBZ + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/1.html b/1.html new file mode 100644 index 0000000000000000000000000000000000000000..57ff173add1a0c335af916a5768f62bf3e0efc0d --- /dev/null +++ b/1.html @@ -0,0 +1,7 @@ +ufaifgka +fkgakugagfkaf +.vmzlp,j,a +khikaymwiuhbzmnv +fkjaqfw +oirm ac + diff --git a/1.txt b/1.txt index 860da43a398d4d0850426c8bad29650b94b77476..386e254416fe4f8083e2f9466dcb199995f8a286 100644 --- a/1.txt +++ b/1.txt @@ -1,14 +1,26 @@ -这是邓帅的提交` -本仓库的本地副本2改动 -毒贩夫妇付付 -这是李苏晨修改的 -<<<<<<< HEAD +一箫一剑平生意。负尽狂名十五年。 +星雪凄天银河垂。狂艳夜回铸楚辞。 +江山图一快。人不流血。刀不收锋。 + +道可道，非常道；名可名，非常名。 + +无名，天地之始，有名，万物之母。 + +故常无欲，以观其妙，常有欲，以观其徼。 bkdfbvdshfb dljsfbkjdsb msfkvndsf 这是常宁博的提交 这是本仓库的陷阱 -这是魏新科的提交 + + + +skldfgaeukyfuo walfjasjtu + +once again commit by ldy +这是第二次修改 +此两者，同出而异名，同谓之玄，玄之又玄，众妙之门。 +12345 diff --git a/11.txt b/11.txt new file mode 100644 index 0000000000000000000000000000000000000000..0c6e16a00eeb8176742a06904127a01194d066c9 --- /dev/null +++ b/11.txt @@ -0,0 +1,27 @@ +sadsad +iafdbasdfh;asdf;sbklzxbcvk; +afblisadilbvlkxcbv +songyu + + + +sssssaaaa + +yu + + +便写点东西。 + + +王冬冬的 + + + + + + + + + + +随便写点东西。 diff --git a/110.txt b/110.txt new file mode 100644 index 0000000000000000000000000000000000000000..29147adb54d15dff68400f18c9d957f55bacdccc --- /dev/null +++ b/110.txt @@ -0,0 +1 @@ +征伐大长腿第一次 diff --git a/2.txt b/2.txt new file mode 100644 index 0000000000000000000000000000000000000000..267cf3e6d9b870965a2f396072b068be994a30aa --- /dev/null +++ b/2.txt @@ -0,0 +1,6 @@ +征伐大长腿的第一次Merge branch 'master' of https://gitee.com/gnadream/testhtml1 + +# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支 +# 合并到主题分支。 +# +# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。 diff --git a/232344234.iiasdf b/232344234.iiasdf new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/23323.txt b/23323.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/3.txt b/3.txt new file mode 100644 index 0000000000000000000000000000000000000000..48212fa8581237fc0a35dc66cce8bc36643fc31b --- /dev/null +++ b/3.txt @@ -0,0 +1,5 @@ +征伐大长腿第一次 +第二次 + + +是的冯绍峰 diff --git a/66.html b/66.html new file mode 100644 index 0000000000000000000000000000000000000000..b69083764c748ec16431400688e6e4e33954610f --- /dev/null +++ b/66.html @@ -0,0 +1,7 @@ +道可道，非常道；名可名，非常名。 + +无名，天地之始，有名，万物之母。 + +故常无欲，以观其妙，常有欲，以观其徼。 + +此两者，同出而异名，同谓之玄，玄之又玄，众妙之门。 diff --git a/7.txt b/7.txt new file mode 100644 index 0000000000000000000000000000000000000000..ce80e1a7be4b2707a741c8215ddc1cd538154d26 --- /dev/null +++ b/7.txt @@ -0,0 +1 @@ +ajgdfkasjhf kj diff --git a/99.txt b/99.txt new file mode 100644 index 0000000000000000000000000000000000000000..ed71bf4f3ee0d4cb0141e71fb83f1bee634299c4 --- /dev/null +++ b/99.txt @@ -0,0 +1 @@ +didi第一次 diff --git a/aa.txt b/aa.txt new file mode 100644 index 0000000000000000000000000000000000000000..fb36a7c5eb27986f6b791fa73f68890e911225b7 --- /dev/null +++ b/aa.txt @@ -0,0 +1,6 @@ +sasdfs +sadfs +sdfdasf +songy + +宋瑜u diff --git a/aabb.txt b/aabb.txt new file mode 100644 index 0000000000000000000000000000000000000000..2ac73c5efa1699be6f641e1bd14d2c0868ce0393 --- /dev/null +++ b/aabb.txt @@ -0,0 +1,7 @@ + +osss + +sss + + +sssO呵呵 diff --git a/aacc.txt b/aacc.txt new file mode 100644 index 0000000000000000000000000000000000000000..a6552c86d9b886505740382b54fd317c22c9e1a9 --- /dev/null +++ b/aacc.txt @@ -0,0 +1,18 @@ +sdafdsf +asdfsdfsfsafsfsfs +sadfsadfasdasfdfdfsafsadf + +sdfasdfsafsafsafsadf + +sa +fsa +f +saf +sf +sf +saf +as +fs +af +dsf +sdfsafsahuh呼呼呼呼虎 diff --git a/bug1 b/bug1 new file mode 100644 index 0000000000000000000000000000000000000000..7eb3c3f3a6e98f7803bd0e9c1afa3bb061513c3d --- /dev/null +++ b/bug1 @@ -0,0 +1,7 @@ +这是个bug; + + + + + +溜了溜了~~~·~~~~ diff --git a/prl b/prl new file mode 100644 index 0000000000000000000000000000000000000000..61483a1dc3fb3f9a9d697a3bcf3ba3db11eea8df --- /dev/null +++ b/prl @@ -0,0 +1,11 @@ +这是一个bug + + + + + + + + + +溜了溜了。。。 diff --git a/prl.text b/prl.text new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/qq.txt b/qq.txt new file mode 100644 index 0000000000000000000000000000000000000000..b20bbfa4b1881350161a2fd7195fe2ae848d38eb --- /dev/null +++ b/qq.txt @@ -0,0 +1,5 @@ +ididiididididi +是个弟弟 + + +你才是个弟弟 哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈 diff --git a/qwe.txt b/qwe.txt new file mode 100644 index 0000000000000000000000000000000000000000..d3ca1b86e3f59d715657b56d89ab9ef77d8bf4d5 --- /dev/null +++ b/qwe.txt @@ -0,0 +1 @@ +常宁博第二次提交 diff --git a/xx.sdfekwe b/xx.sdfekwe new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/xxxxxxx.txt b/xxxxxxx.txt new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391