added the installer

ngsankha · ngsankha · commit d85f0df9ecca · 2012-06-06T18:13:57.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,6 @@
 *~
+<<<<<<< HEAD
 dbinfo.php
+=======
+
+>>>>>>> ec6f72dda3d9d255fe3de2835f2748dee17e879b
diff --git a/admin/problems.php b/admin/problems.php
@@ -9,7 +9,11 @@
 		connectdb();
 ?>
               <li class="active"><a href="#">Admin Panel</a></li>
+<<<<<<< HEAD
               <li><a href="users.php">Users</a></li>
+=======
+              <li><a href="#about">Users</a></li>
+>>>>>>> ec6f72dda3d9d255fe3de2835f2748dee17e879b
               <li><a href="logout.php">Logout</a></li>
             </ul>
           </div><!--/.nav-collapse -->
