D343.diff
No OneTemporary
Actions

Size

710 B

Referenced Files

None

Subscribers

None

D343.diff
View Options

	diff --git a/Dockerfile b/Dockerfile
	--- a/Dockerfile
	+++ b/Dockerfile
	@@ -2,8 +2,8 @@
	# Nasqueron - Base nginx / php-fpm image
	#

	-FROM armv7/armhf-debian
	-MAINTAINER Kaliiixx <modepadu95@riseup.net>
	+FROM debian:jessie
	+MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>

	#
	# Prepare the container
	diff --git a/README.md b/README.md
	--- a/README.md
	+++ b/README.md
	@@ -47,9 +47,6 @@
	# If you need other processes, adds a /etc/service/<service name>/run file

	That's it.
	-<<<<<<< HEAD
	-# docker-arm-nginx-php-fpm
	-=======

	## How to upgrade this image?

	@@ -60,4 +57,3 @@
	cd novolume
	make update
	```
	->>>>>>> 4e6ef53562dafae51fbd8da1dbaf50148bbda6aa