From 195e5dfb0d59dde5a4deb66ddf79c56e2d71c9d5 Mon Sep 17 00:00:00 2001
From: Gabriel Fuentes <blender.1379@gmail.com>
Date: Fri, 22 Feb 2019 19:17:38 -0600
Subject: [PATCH] nav trae elementos en base de datos falta mostrarlos bien2
 FALTA CREAR db EN VIPER

---
 .idea/workspace.xml | 18 ++++++++++++------
 sql/conexion.php    | 16 +---------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 511a0ea..64053c3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -46,8 +46,11 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/sql/conexion.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="154">
-              <caret line="17" column="3" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
+            <state relative-caret-position="22">
+              <caret line="3" column="2" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="4" />
+              <folding>
+                <element signature="e#6#21#0#PHP" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -227,12 +230,12 @@
       <workItem from="1550614927666" duration="10030000" />
       <workItem from="1550701971761" duration="11382000" />
       <workItem from="1550788717386" duration="19590000" />
-      <workItem from="1550868720616" duration="13036000" />
+      <workItem from="1550868720616" duration="13129000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="87527000" />
+    <option name="totallyTimeSpent" value="87620000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
@@ -365,8 +368,11 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/sql/conexion.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="17" column="3" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
+        <state relative-caret-position="22">
+          <caret line="3" column="2" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="4" />
+          <folding>
+            <element signature="e#6#21#0#PHP" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/sql/conexion.php b/sql/conexion.php
index b7ce5b6..3a26c39 100644
--- a/sql/conexion.php
+++ b/sql/conexion.php
@@ -1,7 +1,7 @@
 <?php
 /*
 * local
-*
+* */
 
 
     $host = 'localhost';
@@ -9,20 +9,6 @@
     $pass = 'avatares1';
     $dbname = 'portal_editorial';
     $dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;
-*/
-
-/*
- * conexion viper
- *
- *
- */
-
-
-$host = '132.248.80.194';
-$user = 'usr_inv_material';
-$pass = 'tint4sBond';
-$dbname = 'kalinga_inventario_material';
-$dsn = 'mysql:host=' . $host . ';dbname=' .$dbname;