fixed: conflicts

petersirka · petersirka · commit 3b8183a800c7 · 2015-01-06T10:03:46.000+01:00
diff --git a/framework-install-business-logic-source/definitions/install.js b/framework-install-business-logic-source/definitions/install.js
@@ -1,7 +1,3 @@
 framework.on('load', function() {
-<<<<<<< HEAD
-    framework.install('source', 'test', 'https://www.totaljs.com/inject-source.js');
-=======
     framework.install('source', 'test', 'https://www.totaljs.com/examples/inject-source.js');
->>>>>>> origin/v1.7.0
 });
diff --git a/framework-install-config/definitions/install.js b/framework-install-config/definitions/install.js
@@ -1,7 +1,3 @@
 framework.on('load', function() {
-<<<<<<< HEAD
-	framework.install('config', 'https://www.totaljs.com/inject-config.txt');
-=======
 	framework.install('config', 'https://www.totaljs.com/examples/inject-config.txt');
->>>>>>> origin/v1.7.0
 });
diff --git a/framework-install-controller/index.js b/framework-install-controller/index.js
@@ -7,9 +7,5 @@
 var framework = require('total.js').http('debug');
 
 framework.on('load', function() {
-<<<<<<< HEAD
-    framework.install('controller', 'https://www.totaljs.com/inject-controller.js');
-=======
     framework.install('controller', 'https://www.totaljs.com/examples/inject-controller.js');
->>>>>>> origin/v1.7.0
 });
diff --git a/framework-install-definition/index.js b/framework-install-definition/index.js
@@ -7,9 +7,5 @@
 var framework = require('total.js').http('debug');
 
 framework.on('load', function() {
-<<<<<<< HEAD
-    framework.install('definition', 'https://www.totaljs.com/inject-definition.js');
-=======
     framework.install('definition', 'https://www.totaljs.com/examples/inject-definition.js');
->>>>>>> origin/v1.7.0
 });
diff --git a/framework-install-model/index.js b/framework-install-model/index.js
@@ -7,9 +7,5 @@
 var framework = require('total.js').http('debug');
 
 framework.on('load', function() {
-<<<<<<< HEAD
-    framework.install('model', 'https://www.totaljs.com/inject-model.js');
-=======
     framework.install('model', 'https://www.totaljs.com/examples/inject-model.js');
->>>>>>> origin/v1.7.0
 });
diff --git a/framework-install-module/index.js b/framework-install-module/index.js
@@ -7,9 +7,5 @@
 var framework = require('total.js').http('debug');
 
 framework.on('load', function() {
-<<<<<<< HEAD
-    framework.install('module', 'https://www.totaljs.com/inject-module.js');
-=======
     framework.install('module', 'https://www.totaljs.com/examples/inject-module.js');
->>>>>>> origin/v1.7.0
 });
diff --git a/mongodb/controllers/default.js b/mongodb/controllers/default.js
@@ -1,37 +1,17 @@
 exports.install = function(framework) {
-<<<<<<< HEAD
-    framework.route('/', view_homepage);
-};
-
-function view_homepage() {
-    var self = this;
-
-    var users = DATABASE('users');
-
-=======
     framework.route('/', view_index);
 };
 
 function view_index() {
     var self = this;
     var users = DATABASE('users');
->>>>>>> origin/v1.7.0
     // or
     // var users = framework.database('user');
     // or
     // var users = self.database('user');
-
     users.find({}).limit(10).toArray(function(err, docs) {
-<<<<<<< HEAD
-        self.view('homepage', docs);
-    });
-
-    // or
-    // users.find().limit(10).toArray(self.callback('homepage'));
-=======
         self.view('index', docs);
     });
     // or
     // users.find().limit(10).toArray(self.callback('index'));
->>>>>>> origin/v1.7.0
 }
diff --git a/mongoose/controllers/default.js b/mongoose/controllers/default.js
@@ -4,36 +4,12 @@ exports.install = function(framework) {
 
 // Read all users
 function view_index() {
-	var self = this;
-<<<<<<< HEAD
-	var User = MODEL('user').schema;
 
-=======
+	var self = this;
 	var User = MODEL('user');
->>>>>>> origin/v1.7.0
+
 	User.find(function(err, users) {
 		self.view('index', users);
 	});
-<<<<<<< HEAD
-
-}
-
-// Add a new user
-function json_homepage() {
-
-	var self = this;
-	var User = MODEL('user').schema;
-	var model = self.body;
-
-	var user = new User({ alias: model.alias, created: new Date() }).save(function(err) {
-
-		if (err)
-			self.throw500(err);
-
-		// Read all users
-		User.find(self.callback());
-	});
 
-=======
->>>>>>> origin/v1.7.0
 }
diff --git a/mongoose/definitions/mongoose.js b/mongoose/definitions/mongoose.js
@@ -1,10 +1,4 @@
 // $ sudo npm install -g mongoose
 
 var mongoose = require('mongoose');
-<<<<<<< HEAD
-mongoose.connect('mongodb://totaldemo:123456@ds029979.mongolab.com:29979/totaldemo');
-
-=======
-mongoose.connect(CONFIG('database'));
->>>>>>> origin/v1.7.0
-global.mongoose = mongoose;
+mongoose.connect(CONFIG('database'));
diff --git a/mongoose/views/homepage.html b/mongoose/views/homepage.html
