Skip to content

Commit aeff7ba

Browse files
committed
Merge branch 'master' of github.com:Criptoreal/Criptoreal
2 parents 50ed002 + 7b059cc commit aeff7ba

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

doc/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
<<<<<<< HEAD
12
Criptoreal Core 1.2.0
3+
=======
4+
Criptoreal Core 1.1.0
5+
>>>>>>> 7b059cc70442b0c64cbeae63f1345cfc8cb249a0
26
=====================
37

48
This is the official reference wallet for Criptoreal digital currency and comprises the backbone of the Criptoreal peer-to-peer network. You can [download Criptoreal Core](https://www.criptoreal.org/) or [build it yourself](#building) using the guides below.

0 commit comments

Comments
 (0)