Skip to content
This repository has been archived by the owner on Nov 15, 2020. It is now read-only.

downgrade to java 1.7 #14

Merged
merged 7 commits into from
Feb 7, 2017
Merged

downgrade to java 1.7 #14

merged 7 commits into from
Feb 7, 2017

Conversation

clicman
Copy link
Contributor

@clicman clicman commented Jan 17, 2017

Note. This PR brokes html element support until our fork will released.
But its good for merge.

# Conflicts:
#	src/main/java/ru/sbtqa/tag/pagefactory/Page.java
#	src/main/java/ru/sbtqa/tag/pagefactory/PageFactory.java
#	src/main/java/ru/sbtqa/tag/pagefactory/PageWrapper.java
#	src/main/java/ru/sbtqa/tag/pagefactory/annotations/ActionTitle.java
#	src/main/java/ru/sbtqa/tag/pagefactory/support/DesiredCapabilitiesParser.java
@clicman clicman added the support label Feb 7, 2017
@@ -1,14 +1,14 @@
package ru.sbtqa.tag.pagefactory.annotations;

import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
//import java.lang.annotation.Repeatable;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this

@kosteman kosteman merged commit eb342f6 into master Feb 7, 2017
@clicman clicman deleted the downgrade-to-java7 branch February 10, 2017 03:53
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants