|
|
|
@ -1,10 +1,6 @@
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"name": "dtp-sites",
|
|
|
|
"name": "dtp-sites",
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
"version": "0.6.13",
|
|
|
|
|
|
|
|
=======
|
|
|
|
|
|
|
|
"version": "0.7.1",
|
|
|
|
"version": "0.7.1",
|
|
|
|
>>>>>>> 228169f4b66e2cd17892cec984f424ec323ea3e2
|
|
|
|
|
|
|
|
"description": "Open source blogging engine for the Digital Telepresence Platform.",
|
|
|
|
"description": "Open source blogging engine for the Digital Telepresence Platform.",
|
|
|
|
"main": "dtp-sites.js",
|
|
|
|
"main": "dtp-sites.js",
|
|
|
|
"author": "DTP Technologies, LLC",
|
|
|
|
"author": "DTP Technologies, LLC",
|
|
|
|
|
