Fixed conflict detection on Google Drive

cache.manifest

@@ -1 +1 @@
-CACHE MANIFEST
# v25

CACHE:
index.html
viewer.html
css/main-min.css
js/main-min.js
js/require.js
img/ajax-loader.gif
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/icons.png
img/stackedit-32.ico
img/stackedit-promo.png

NETWORK:
*
+CACHE MANIFEST
# v26

CACHE:
index.html
viewer.html
css/main-min.css
js/main-min.js
js/require.js
img/ajax-loader.gif
img/glyphicons-halflings.png
img/glyphicons-halflings-white.png
img/icons.png
img/stackedit-32.ico
img/stackedit-promo.png

NETWORK:
*

js/dropbox-provider.js

@@ -203,7 +203,7 @@ define(["jquery", "core", "dropbox-helper"], function($, core, dropboxHelper) {
 						core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
 					}
 					// If file content changed
-					if(fileContentChanged) {
+					if(fileContentChanged && remoteContentChanged === true) {
 						localStorage[fileIndex + ".content"] = file.content;
 						core.showMessage('"' + localTitle + '" has been updated from Dropbox.');
 						if(core.fileManager.isCurrentFileIndex(fileIndex)) {

js/gdrive-provider.js

@@ -199,13 +199,13 @@ define(["jquery", "core", "google-helper", "underscore"], function($, core, goog
 						core.showMessage('Conflict detected on "' + localTitle + '". A backup has been created locally.');
 					}
 					// If file title changed
-					if(fileTitleChanged) {
+					if(fileTitleChanged && remoteTitleChanged === true) {
 						localStorage[fileIndex + ".title"] = file.title;
 						updateFileTitles = true;
 						core.showMessage('"' + localTitle + '" has been renamed to "' + file.title + '" on Google Drive.');
 					}
 					// If file content changed
-					if(fileContentChanged) {
+					if(fileContentChanged && remoteContentChanged === true) {
 						localStorage[fileIndex + ".content"] = file.content;
 						core.showMessage('"' + file.title + '" has been updated from Google Drive.');
 						if(core.fileManager.isCurrentFileIndex(fileIndex)) {