/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 php/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:
php/db.php
140
140
                CREATE TABLE IF NOT EXISTS dateInterests(
141
141
                user1 varchar(64),
142
142
                user2 varchar(64),
 
143
<<<<<<< TREE
143
144
                FOREIGN KEY(user1) REFERENCES Users(loginName),
144
145
                FOREIGN KEY(user2) REFERENCES Users(loginName),
145
146
                PRIMARY KEY(user1, user2)
158
159
                PRIMARY KEY(user1, user2)
159
160
                );
160
161
        ");
 
162
        
 
163
=======
 
164
                FOREIGN KEY(user1) REFERENCES USERS(loginName),
 
165
                FOREIGN KEY(user2) REFERENCES USERS(loginName),
 
166
                PRIMARY KEY(user1, user2)
 
167
                );
 
168
        ");
161
169
  $db->commit();
 
170
>>>>>>> MERGE-SOURCE
162
171
} catch (PDOException $err) {
163
172
  echo $err;
164
173
}