aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorPitu <[email protected]>2017-01-13 04:34:21 -0300
committerPitu <[email protected]>2017-01-13 04:34:21 -0300
commit376cf10663f76d99721ee8596634488868482606 (patch)
tree28774ab842a044e571a31b7612311ef1a339be48 /README.md
parentInitial commit (diff)
downloadhost.fuwn.me-376cf10663f76d99721ee8596634488868482606.tar.xz
host.fuwn.me-376cf10663f76d99721ee8596634488868482606.zip
First version
Diffstat (limited to 'README.md')
-rw-r--r--README.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/README.md b/README.md
index 1284b92..96f6abd 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
+# loli-bank
+Pomf-like image uploading service, written in NodeJS
+=======
# loli-safe
Pomf-like file uploading service, written in NodeJS
+>>>>>>> b285f244150d0eb79376716501a97b9416497344