From e3b8f3fe403fa92c11616c301da31c235b4347ef Mon Sep 17 00:00:00 2001
From: alex <alexander.sukono@gmail.com>
Date: Mon, 16 May 2016 22:32:30 +0700
Subject: [PATCH] fix conflict

---
 bdgwebkit/permohonanClass.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bdgwebkit/permohonanClass.php b/bdgwebkit/permohonanClass.php
index 6bbc955..398dac6 100644
--- a/bdgwebkit/permohonanClass.php
+++ b/bdgwebkit/permohonanClass.php
@@ -39,7 +39,8 @@ class Permohonan{
 					namaIbu='$data[NamaIbu]',
 					alamatIbu='$data[AlamatIbu]',
 					idIbu='$data[NIKIbu]',
-					idRumahsakit='$data[idRumahsakit]'
+					idRumahsakit='$data[idRumahsakit]',
+					status = 'diproses'
 				WHERE
 					id = $data[permohonan_id]";
 
-- 
GitLab