/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: Gustav Hatvigsson
  • Date: 2013-04-14 05:57:39 UTC
  • Revision ID: gustav.hartvigsson@gmail.com-20130414055739-vwcqdu91f3umwqv7
ohoeauht

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
144
143
                FOREIGN KEY(user1) REFERENCES Users(loginName),
145
144
                FOREIGN KEY(user2) REFERENCES Users(loginName),
146
145
                PRIMARY KEY(user1, user2)
159
158
                PRIMARY KEY(user1, user2)
160
159
                );
161
160
        ");
162
 
        
163
 
=======
164
 
                FOREIGN KEY(user1) REFERENCES USERS(loginName),
165
 
                FOREIGN KEY(user2) REFERENCES USERS(loginName),
166
 
                PRIMARY KEY(user1, user2)
167
 
                );
168
 
        ");
169
161
  $db->commit();
170
 
>>>>>>> MERGE-SOURCE
171
162
} catch (PDOException $err) {
172
163
  echo $err;
173
164
}