Permalink
Browse files

:O, Re-merge...

  • Loading branch information...
1 parent 42ba279 commit bbcdc02f6f1b2a13a1ea53458f734e6fbca3475b @nycholas committed Aug 4, 2010
Showing with 0 additions and 5 deletions.
  1. +0 −5 README
View
5 README
@@ -1,11 +1,6 @@
== COMPLILE
-<<<<<<< HEAD
$ mysql -u root -p << doc/database/mysql/create-database.sql
$ qmake -r
-=======
-$ mysql -u root -p < resources/db/mysql/create-database.sql
-$ qmake -project "QT += sql" "UI_DIR = widgets" "OBJECTS_DIR = obj" "MOC_DIR = obj"
->>>>>>> fa436485ed111c2a80e88a8c90e2498488ac1be6
$ make
$ ./bin/c-project

0 comments on commit bbcdc02

Please sign in to comment.