fixed · af0fa30879 - familyARK - hatthieves.es git server

g/familyARK

fixed

This commit is contained in:

Gustavo Adolfo Mesa Roldán

2020-04-02 00:30:43 +02:00

parent a7760c6ada

commit af0fa30879

1 changed files with 0 additions and 3 deletions

									
										familyark/app/entrypoint.sh
									
		-3
	
												View File
												
					@@ -1,7 +1,4 @@

					#!/bin/bash

					#!/bin/bash

					<<<<<<< HEAD

					npm i --unsafe-perm

					npm i --unsafe-perm

					=======

					>>>>>>> d64f7d2a7f505b161de3c0ef05fc9e74e59d978c

					yarn

					yarn

					node server

					node server