/extremedating/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/extremedating/trunk

« back to all changes in this revision

Viewing changes to look_in_db.php

  • Committer: Daniel Johansson
  • Date: 2013-04-14 05:12:33 UTC
  • mfrom: (52.1.3 extremedating)
  • Revision ID: maila@danieljohansson.nu-20130414051233-b20jfdvg8xvqxmky
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
look_in_db.php
2
2
        <body>
3
3
                <?php
4
4
                        include "./php/db.php";
 
5
<<<<<<< TREE
5
6
                        $query = "SELECT * FROM planLunch";
 
7
=======
 
8
                        $query = "SELECT * FROM Interests";
 
9
>>>>>>> MERGE-SOURCE
6
10
                        $userinfo = $db->query($query);
7
11
                        $fetch = $userinfo->fetchAll();
8
12
                        echo '<table border="1">';