Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Deletion prefs Datei

  • Loading branch information...
commit 0e7af70dea874176336c9739cb8e4839a92d60f4 1 parent 43737c2
@westerholz westerholz authored
Showing with 0 additions and 13 deletions.
  1. +0 −13 .settings/com.vaadin.integration.eclipse.prefs
View
13 .settings/com.vaadin.integration.eclipse.prefs
@@ -1,13 +0,0 @@
-<<<<<<< HEAD
-com.vaadin.integration.eclipse.useLatestNightly=false
-com.vaadin.integration.eclipse.widgetsetBuildsSuspended=true
-com.vaadin.integration.eclipse.widgetsetCompilationEta=117872
-com.vaadin.integration.eclipse.widgetsetDirty=true
-eclipse.preferences.version=1
-=======
-com.vaadin.integration.eclipse.useLatestNightly=false
-com.vaadin.integration.eclipse.widgetsetBuildsSuspended=true
-com.vaadin.integration.eclipse.widgetsetCompilationEta=417131
-com.vaadin.integration.eclipse.widgetsetDirty=false
-eclipse.preferences.version=1
->>>>>>> refs/remotes/origin/master
Please sign in to comment.
Something went wrong with that request. Please try again.